Re #58 Fixed MSVC 2005 build and install
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@5352 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: fdf3fbb482bdc56d12750715bc238b8a8004b157 Former-commit-id: 488d22c94d3cb9323f65e5f21273a6393c7d2858
This commit is contained in:
parent
a2c721ae45
commit
b29c64b055
1 changed files with 5 additions and 4 deletions
|
@ -30,9 +30,9 @@ MACRO(_GET_TARGET_REAL_PATHNAME TGT_NAME VAR_PATHNAME)
|
|||
GET_TARGET_PROPERTY(${VAR_PATHNAME} ${TGT_NAME} LOCATION)
|
||||
MESSAGE(STATUS "GET_TARGET_REAL_PATHNAME(${TGT_NAME})=${${VAR_PATHNAME}}")
|
||||
IF(MSVC)
|
||||
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" ${VAR_PATHNAME} \${${VAR_PATHNAME}})
|
||||
STRING(REPLACE \"$(ConfigurationName)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" ${VAR_PATHNAME} \${${VAR_PATHNAME}})
|
||||
STRING(REPLACE \"$(Configuration)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" ${VAR_PATHNAME} \${${VAR_PATHNAME}})
|
||||
STRING(REPLACE "$(OutDir)" "${CMAKE_INSTALL_CONFIG_NAME}" ${VAR_PATHNAME} ${${VAR_PATHNAME}})
|
||||
STRING(REPLACE "$(ConfigurationName)" "${CMAKE_INSTALL_CONFIG_NAME}" ${VAR_PATHNAME} ${${VAR_PATHNAME}})
|
||||
STRING(REPLACE "$(Configuration)" "${CMAKE_INSTALL_CONFIG_NAME}" ${VAR_PATHNAME} ${${VAR_PATHNAME}})
|
||||
ENDIF(MSVC)
|
||||
|
||||
ENDMACRO(_GET_TARGET_REAL_PATHNAME TGT_NAME VAR_PATHNAME)
|
||||
|
@ -66,7 +66,7 @@ ENDMACRO(SD_SETUP_SETTINGS_VERSION)
|
|||
MACRO(SD_UPDATE_SETTINGS_VERSION)
|
||||
|
||||
# Determine the full path-name of xmlversion.exe
|
||||
IF(FALSE AND WIN32)
|
||||
IF(MSVC)
|
||||
|
||||
# Does not work with MinGW at leat !?
|
||||
MESSAGE(STATUS "CMAKE_BINARY_DIR=${CMAKE_BINARY_DIR}")
|
||||
|
@ -77,6 +77,7 @@ MACRO(SD_UPDATE_SETTINGS_VERSION)
|
|||
_GET_TARGET_REAL_PATHNAME(xmlversion _XMLVER_EXE)
|
||||
|
||||
ENDIF()
|
||||
MESSAGE(STATUS "_XMLVER_EXE=${_XMLVER_EXE}")
|
||||
|
||||
# In order to run xmlversion.exe in the build tree (see below), under Windows,
|
||||
# we nearly always have to copy dependency DLLs next to it.
|
||||
|
|
Loading…
Reference in a new issue