From b29c64b05513e2603760e3801c81b7adb4484f71 Mon Sep 17 00:00:00 2001 From: pouillot Date: Sat, 23 Mar 2013 23:03:52 +0000 Subject: [PATCH] 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 --- cmake/install.cmake | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cmake/install.cmake b/cmake/install.cmake index bade4a7bc..0aaad283b 100644 --- a/cmake/install.cmake +++ b/cmake/install.cmake @@ -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.