jepler/stepcode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

change scl_version_string.cmake to fix parallel ctest issue

Browse source 
This replaces use of the system time command with __DATE__ and __TIME__

I think the following two errors are caused by fedex_plus being rebuilt for each test:

Linking CXX executable ../../bin/fedex_plus
CMakeFiles/fedex_plus.dir/__/express/fedex.c.o: file not recognized: File truncated

and

[ 87%] Running fedex_plus for AP214E3_2010...
/bin/sh: /opt/step/test-scl/build_ctest/bin/fedex_plus: Text file busy

fedex_plus is being rebuilt because the version string changes, since it contains the date and time.
This commit is contained in:
Mark Pictor 2011-12-07 18:34:30 -05:00
parent 48dff49299
commit 13204e4027
1 changed files with 1 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmake/scl_version_string.cmake
View file

@ -27,20 +27,6 @@ endif()
string( REPLACE "\n" "" GIT_COMMIT_ID ${GIT_COMMIT_ID} )
set( res_var 1 )
IF (WIN32)
EXECUTE_PROCESS(COMMAND "date" "/T" RESULT_VARIABLE res_var OUTPUT_VARIABLE TIMESTAMP )
ELSEIF(UNIX)
EXECUTE_PROCESS(COMMAND "date" RESULT_VARIABLE res_var OUTPUT_VARIABLE TIMESTAMP )
ELSE()
MESSAGE(WARNING "Unknown platform: date not included in version string")
ENDIF()
if( NOT ${res_var} EQUAL 0 )
SET( TIMESTAMP "000000" )
else()
string( REPLACE "\n" "" TIMESTAMP ${TIMESTAMP} )
endif()
set( vstring "//scl_version_string.h - written by cmake. Changes will be lost!\n"
"#ifndef SCL_VERSION_STRING\n"
"#define SCL_VERSION_STRING\n\n"
@ -49,7 +35,7 @@ set( vstring "//scl_version_string.h - written by cmake. Changes will be lost!\n
"** 'g' is unknown, 5e1fb47 is the first 7 chars of the git sha1 commit id, and\n"
"** <timestamp> is the output of your system's 'date' command.\n*/\n\n"
"const char* scl_version() {\n"
" return \"git commit id ${GIT_COMMIT_ID}, built on ${TIMESTAMP}\"\;\n"
" return \"git commit id ${GIT_COMMIT_ID}, built at \"__TIME__\" on \"__DATE__\;\n"
"}\n\n"
"#endif\n"
)