speed-dreams/speed-dreams-code
speed-dreams/speed-dreams-code
7
1
Fork 3
Code Issues 9 Pull requests Projects Releases Packages Wiki Activity Actions 5

Re #189 (fixed broken Linux's side)

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2799 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: a2b6b137accbd0da6acce4757c49b34c60560645
Former-commit-id: c59f254a2c983a57cfa8747eacf15c8a1c051823
This commit is contained in:
pouillot 2010-09-25 18:35:48 +00:00
parent a22e246673
commit e9f2228eb1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmake/macros.cmake
View file

@ -1057,7 +1057,6 @@ MACRO(SD_INSTALL_FILES)
IF(WIN32)
GET_TARGET_PROPERTY(TXML_LIB txml LOCATION)
GET_TARGET_PROPERTY(TGF_LIB tgf LOCATION)
SET(SD_DATADIR_ABS ${SD_DATADIR})
INSTALL(CODE
"FILE(READ ${CMAKE_BINARY_DIR}/xmlversion_loc.txt XMLVERSION_EXE)
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
@ -1067,19 +1066,20 @@ MACRO(SD_INSTALL_FILES)
SET(TGF_LIB ${TGF_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
FILE(INSTALL DESTINATION \${XMLVERSION_DIR} TYPE FILE FILES \${TXML_LIB} \${TGF_LIB})
IF(NOT IS_ABSOLUTE ${SD_DATADIR_ABS})
GET_FILENAME_COMPONENT(SD_DATADIR_ABS \${CMAKE_INSTALL_PREFIX}/${SD_DATADIR_ABS} ABSOLUTE)
SET(SD_DATADIR_ABS \"${SD_DATADIR}\")
IF(NOT IS_ABSOLUTE \${SD_DATADIR_ABS})
GET_FILENAME_COMPONENT(SD_DATADIR_ABS \"\${CMAKE_INSTALL_PREFIX}/\${SD_DATADIR_ABS}\" ABSOLUTE)
ENDIF()
EXECUTE_PROCESS(COMMAND \"\${XMLVERSION_EXE}\" \"\${SD_DATADIR_ABS}/version.xml\" \"\${CMAKE_INSTALL_PREFIX}/${DEST_ALL}/${XMLFILENAME}\" \"${USER_PATH}/${XMLFILENAME}\" RESULT_VARIABLE XMLVERSTATUS)
IF(XMLVERSTATUS)
MESSAGE(FATAL_ERROR \"ERROR: xmlversion failed\")
ENDIF(XMLVERSTATUS)")
ELSE(WIN32)
SET(SD_DATADIR_ABS ${SD_DATADIR})
INSTALL(CODE
"FILE(READ ${CMAKE_BINARY_DIR}/xmlversion_loc.txt XMLVERSION_EXE)
IF(NOT IS_ABSOLUTE ${SD_DATADIR_ABS})
GET_FILENAME_COMPONENT(SD_DATADIR_ABS \${CMAKE_INSTALL_PREFIX}/${SD_DATADIR_ABS} ABSOLUTE)
SET(SD_DATADIR_ABS \"${SD_DATADIR}\")
IF(NOT IS_ABSOLUTE \${SD_DATADIR_ABS})
GET_FILENAME_COMPONENT(SD_DATADIR_ABS \"\${CMAKE_INSTALL_PREFIX}/\${SD_DATADIR_ABS}\" ABSOLUTE)
ENDIF()
# Why this path correction here ? This needs a comment !
SET(CUR_DESTDIR \"\$ENV{DESTDIR}\")
@ -1088,7 +1088,7 @@ MACRO(SD_INSTALL_FILES)
ELSE(CUR_DESTDIR MATCHES \"[^/]\")
SET(CUR_DESTDIR_CORR \"\")
ENDIF(CUR_DESTDIR MATCHES \"[^/]\")
EXECUTE_PROCESS(COMMAND \${XMLVERSION_EXE} \"\${CUR_DESTDIR_CORR}${SD_DATADIR_ABS}/version.xml\" \${CUR_DESTDIR_CORR}\${CMAKE_INSTALL_PREFIX}/${DEST_ALL}/${XMLFILENAME} ${USER_PATH}/${XMLFILENAME} RESULT_VARIABLE XMLVERSTATUS)
EXECUTE_PROCESS(COMMAND \${XMLVERSION_EXE} \"\${CUR_DESTDIR_CORR}\${SD_DATADIR_ABS}/version.xml\" \"\${CUR_DESTDIR_CORR}\${CMAKE_INSTALL_PREFIX}/${DEST_ALL}/${XMLFILENAME}\" \"${USER_PATH}/${XMLFILENAME}\" RESULT_VARIABLE XMLVERSTATUS)
IF(XMLVERSTATUS)
MESSAGE(FATAL_ERROR \"ERROR: xmlversion failed\")
ENDIF(XMLVERSTATUS)")