Changeset 3054 for trunk

Timestamp:

10/23/15 16:25:49 (8 years ago)

Author:

Kana Sugimoto

Message:

New Development: Yes

JIRA Issue: No

Ready for Test: Yes

Interface Changes: No

What Interface Changed:

Test Programs: build asap using CMake

Put in Release Notes: No

Module(s): build of asap by CMake

Description: Committing the changes sent by Ville to support git migration

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• cmake/exec_getgitrev.sh (added)
• getgitrev.sh (added)

trunk/CMakeLists.txt

@@ -683 +683 @@
 # run chmod to make sure the script has executable 
 #
-exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/getsvnrev.sh )
-exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/cmake/exec_getsvnrev.sh )
-exec_program( ${ASAP_SOURCE_DIR}/cmake/exec_getsvnrev.sh ARGS ${ASAP_SOURCE_DIR})
+execute_process( COMMAND svn info
+                   RESULT_VARIABLE SVNINFOSTATUS
+                   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)
+message("SVNINFOSTATUS: ${SVNINFOSTATUS}")
+
+if(${SVNINFOSTATUS} STREQUAL "0")
+    message("Running svn scripts.")
+    exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/getsvnrev.sh )
+    exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/cmake/exec_getsvnrev.sh )
+    exec_program( ${ASAP_SOURCE_DIR}/cmake/exec_getsvnrev.sh ARGS ${ASAP_SOURCE_DIR})
+else ()
+    message("Couldn't get svn info. Running git scripts.")
+    exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/getgitrev.sh )
+    exec_program( chmod ARGS a+x ${ASAP_SOURCE_DIR}/cmake/exec_getgitrev.sh )
+    exec_program( ${ASAP_SOURCE_DIR}/cmake/exec_getgitrev.sh ARGS ${ASAP_SOURCE_DIR})
+endif ()
 
 # Add the modules to be built.