iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

xmlversion.exe needs portability.dll

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

Former-commit-id: b329c1f1f6e1dfbf38666ca6e9d4cf051ba2f34f
Former-commit-id: 1ae33f475dd1efce1a3fe618124519d5d3378f33
This commit is contained in:
beaglejoe 2013-03-13 09:15:14 +00:00
parent 3f1f99cb34
commit 5ca56d97d5
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmake/install.cmake
View file

@ -174,6 +174,7 @@ MACRO(SD_INSTALL_FILES)
# In order to run xmlversion.exe in the build tree (see below), under Windows,
# we nearly always have to copy all dependencies next to it (tgf, txml or Expat, SDL, compiler run-time).
GET_TARGET_PROPERTY(TGF_LIB tgf LOCATION)
GET_TARGET_PROPERTY(PORTABILITY_LIB portability LOCATION)
IF(NOT OPTION_3RDPARTY_EXPAT)
GET_TARGET_PROPERTY(TXML_LIB txml LOCATION)
ELSE(NOT OPTION_3RDPARTY_EXPAT)
@ -219,6 +220,11 @@ MACRO(SD_INSTALL_FILES)
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
LIST(APPEND _LIBS_TO_INSTALL \${TGF_LIB})
SET(PORTABILITY_LIB ${PORTABILITY_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" PORTABILITY_LIB \${PORTABILITY_LIB})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" PORTABILITY_LIB \${PORTABILITY_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" PORTABILITY_LIB \${PORTABILITY_LIB})
LIST(APPEND _LIBS_TO_INSTALL \${PORTABILITY_LIB})
GET_FILENAME_COMPONENT(XMLVERSION_DIR \"\${XMLVERSION_EXE}\" PATH)
MESSAGE(STATUS \"xmlversion : Libs to install=\${_LIBS_TO_INSTALL}\")
FILE(INSTALL DESTINATION \"\${XMLVERSION_DIR}\" TYPE FILE FILES \${_LIBS_TO_INSTALL})
@ -245,6 +251,7 @@ MACRO(SD_INSTALL_FILES)
IF(NOT OPTION_3RDPARTY_EXPAT)
LIST(APPEND _LIBS_TO_INSTALL \"${TXML_LIB}\")
ENDIF(NOT OPTION_3RDPARTY_EXPAT)
LIST(APPEND _LIBS_TO_INSTALL \"${PORTABILITY_LIB}\")
# CMake configuration for MSYS Makefiles generator assumes that 3rd party dependencies are installed
# in standard Linux folders, hence in the PATH ; so no need to install next to xmlversion exe.
IF(NOT CMAKE_GENERATOR STREQUAL \"MSYS Makefiles\")
@ -394,6 +401,7 @@ MACRO(SD_INSTALL_DIRECTORIES)
# In order to run xmlversion.exe in the build tree (see below), under Windows,
# we nearly always have to copy all dependencies next to it (tgf, txml or Expat, SDL, compiler run-time).
GET_TARGET_PROPERTY(TGF_LIB tgf LOCATION)
GET_TARGET_PROPERTY(PORTABILITY_LIB portability LOCATION)
IF(NOT OPTION_3RDPARTY_EXPAT)
GET_TARGET_PROPERTY(TXML_LIB txml LOCATION)
ELSE(NOT OPTION_3RDPARTY_EXPAT)
@ -442,6 +450,11 @@ MACRO(SD_INSTALL_DIRECTORIES)
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
LIST(APPEND _LIBS_TO_INSTALL \"\${TGF_LIB}\")
SET(PORTABILITY_LIB ${PORTABILITY_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" PORTABILITY_LIB \${PORTABILITY_LIB})
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" PORTABILITY_LIB \${PORTABILITY_LIB})
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" PORTABILITY_LIB \${PORTABILITY_LIB})
LIST(APPEND _LIBS_TO_INSTALL \"\${PORTABILITY_LIB}\")
MESSAGE(STATUS \"xmlversion : Libs to install=\${_LIBS_TO_INSTALL}\")
GET_FILENAME_COMPONENT(XMLVERSION_DIR \"\${XMLVERSION_EXE}\" PATH)
FILE(INSTALL DESTINATION \"\${XMLVERSION_DIR}\" TYPE FILE FILES \${_LIBS_TO_INSTALL})
@ -472,6 +485,7 @@ MACRO(SD_INSTALL_DIRECTORIES)
SET(MINGW ${MINGW})
IF(MINGW)
SET(_LIBS_TO_INSTALL \"${TGF_LIB}\")
LIST(APPEND _LIBS_TO_INSTALL \${PORTABILITY_LIB})
SET(OPTION_3RDPARTY_EXPAT ${OPTION_3RDPARTY_EXPAT})
IF(NOT OPTION_3RDPARTY_EXPAT)
LIST(APPEND _LIBS_TO_INSTALL \"${TXML_LIB}\")