diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-29 13:23:27 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-29 13:23:27 (GMT) |
| commit | 43d380e0d8c6458b7b729dbc8eab4f504960f9f9 (patch) | |
| tree | e8378ac0343ed8aa6958059257d2832f1033d2bc /Tests | |
| parent | ed0999c9d1c60bdb5be4354e068a95936819b996 (diff) | |
| download | CMake-43d380e0d8c6458b7b729dbc8eab4f504960f9f9.zip CMake-43d380e0d8c6458b7b729dbc8eab4f504960f9f9.tar.gz CMake-43d380e0d8c6458b7b729dbc8eab4f504960f9f9.tar.bz2 | |
ENH: Better handling of debug postfix and fix the test
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 24 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 24 |
2 files changed, 2 insertions, 46 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 22f8387..e1e08b1 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -7,28 +7,6 @@ SET(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}") SET(CMAKE_DEBUG_POSTFIX "_test_debug_postfix") SET(EXTRA_INSTALL_FLAGS) -IF(CMAKE_GENERATOR MATCHES "^Visual Studio") - MESSAGE("CMake generator: ${CMAKE_GENERATOR}") - FOREACH(build_type Debug Release RelWithDebInfo MinSizeRel) - IF(MAKEPROGRAM MATCHES "/build ${build_type}") - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${build_type}) - ENDIF(MAKEPROGRAM MATCHES "/build ${build_type}") - IF(MAKEPROGRAM MATCHES "- ${build_type}") - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${build_type}) - ENDIF(MAKEPROGRAM MATCHES "- ${build_type}") - ENDFOREACH(build_type) - IF(NOT ${EXTRA_INSTALL_FLAGS}) - IF(BUILD_TYPE) - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${BUILD_TYPE}) - ENDIF(BUILD_TYPE) - ENDIF(NOT ${EXTRA_INSTALL_FLAGS}) - IF(NOT DEFINED EXTRA_INSTALL_FLAGS) - IF(NOT "$ENV{SIMPLE_INSTALL_BUILD_TYPE}" MATCHES "^$") - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=$ENV{SIMPLE_INSTALL_BUILD_TYPE}) - ENDIF(NOT "$ENV{SIMPLE_INSTALL_BUILD_TYPE}" MATCHES "^$") - ENDIF(NOT DEFINED EXTRA_INSTALL_FLAGS) -ENDIF(CMAKE_GENERATOR MATCHES "^Visual Studio") - MESSAGE("Extra install: ${EXTRA_INSTALL_FLAGS}") IF(STAGE2) @@ -94,7 +72,7 @@ ADD_CUSTOM_COMMAND( TARGET ${install_target} POST_BUILD COMMAND ${CMAKE_COMMAND} - ARGS ${EXTRA_INSTALL_FLAGS} + ARGS -DBUILD_TYPE:STRING=${CMAKE_CFG_INTDIR} -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake" COMMENT "Install Project" ) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 22f8387..e1e08b1 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -7,28 +7,6 @@ SET(LIBRARY_OUTPUT_PATH "${EXECUTABLE_OUTPUT_PATH}") SET(CMAKE_DEBUG_POSTFIX "_test_debug_postfix") SET(EXTRA_INSTALL_FLAGS) -IF(CMAKE_GENERATOR MATCHES "^Visual Studio") - MESSAGE("CMake generator: ${CMAKE_GENERATOR}") - FOREACH(build_type Debug Release RelWithDebInfo MinSizeRel) - IF(MAKEPROGRAM MATCHES "/build ${build_type}") - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${build_type}) - ENDIF(MAKEPROGRAM MATCHES "/build ${build_type}") - IF(MAKEPROGRAM MATCHES "- ${build_type}") - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${build_type}) - ENDIF(MAKEPROGRAM MATCHES "- ${build_type}") - ENDFOREACH(build_type) - IF(NOT ${EXTRA_INSTALL_FLAGS}) - IF(BUILD_TYPE) - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${BUILD_TYPE}) - ENDIF(BUILD_TYPE) - ENDIF(NOT ${EXTRA_INSTALL_FLAGS}) - IF(NOT DEFINED EXTRA_INSTALL_FLAGS) - IF(NOT "$ENV{SIMPLE_INSTALL_BUILD_TYPE}" MATCHES "^$") - SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=$ENV{SIMPLE_INSTALL_BUILD_TYPE}) - ENDIF(NOT "$ENV{SIMPLE_INSTALL_BUILD_TYPE}" MATCHES "^$") - ENDIF(NOT DEFINED EXTRA_INSTALL_FLAGS) -ENDIF(CMAKE_GENERATOR MATCHES "^Visual Studio") - MESSAGE("Extra install: ${EXTRA_INSTALL_FLAGS}") IF(STAGE2) @@ -94,7 +72,7 @@ ADD_CUSTOM_COMMAND( TARGET ${install_target} POST_BUILD COMMAND ${CMAKE_COMMAND} - ARGS ${EXTRA_INSTALL_FLAGS} + ARGS -DBUILD_TYPE:STRING=${CMAKE_CFG_INTDIR} -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake" COMMENT "Install Project" ) |