diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-28 20:39:51 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-06-28 20:39:51 (GMT) |
| commit | ed0999c9d1c60bdb5be4354e068a95936819b996 (patch) | |
| tree | a03f9f3c55a84c0a33dca7e8a479a8eee835eff7 /Tests | |
| parent | f9b43b9212b1ae2ba4dd9c4f609f8d5093421398 (diff) | |
| download | CMake-ed0999c9d1c60bdb5be4354e068a95936819b996.zip CMake-ed0999c9d1c60bdb5be4354e068a95936819b996.tar.gz CMake-ed0999c9d1c60bdb5be4354e068a95936819b996.tar.bz2 | |
ERR: Fix visual studio install
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Tests/SimpleInstallS2/CMakeLists.txt | 11 |
2 files changed, 16 insertions, 6 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index fc36dd1..22f8387 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -17,11 +17,16 @@ IF(CMAKE_GENERATOR MATCHES "^Visual Studio") SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${build_type}) ENDIF(MAKEPROGRAM MATCHES "- ${build_type}") ENDFOREACH(build_type) - IF(NOT EXTRA_INSTALL_FLAGS) + IF(NOT ${EXTRA_INSTALL_FLAGS}) IF(BUILD_TYPE) SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${BUILD_TYPE}) ENDIF(BUILD_TYPE) - ENDIF(NOT EXTRA_INSTALL_FLAGS) + 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}") @@ -71,7 +76,7 @@ ELSE(STAGE2) ADD_DEPENDENCIES(SimpleInstall test3) ADD_DEPENDENCIES(test2 test3) - ADD_DEPENDENCIES(test4 test3) + ADD_DEPENDENCIES(test4 test2) INSTALL_TARGETS(/bin SimpleInstall) INSTALL_TARGETS(/lib test1 test2 test3 test4) diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index fc36dd1..22f8387 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -17,11 +17,16 @@ IF(CMAKE_GENERATOR MATCHES "^Visual Studio") SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${build_type}) ENDIF(MAKEPROGRAM MATCHES "- ${build_type}") ENDFOREACH(build_type) - IF(NOT EXTRA_INSTALL_FLAGS) + IF(NOT ${EXTRA_INSTALL_FLAGS}) IF(BUILD_TYPE) SET(EXTRA_INSTALL_FLAGS -DBUILD_TYPE=${BUILD_TYPE}) ENDIF(BUILD_TYPE) - ENDIF(NOT EXTRA_INSTALL_FLAGS) + 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}") @@ -71,7 +76,7 @@ ELSE(STAGE2) ADD_DEPENDENCIES(SimpleInstall test3) ADD_DEPENDENCIES(test2 test3) - ADD_DEPENDENCIES(test4 test3) + ADD_DEPENDENCIES(test4 test2) INSTALL_TARGETS(/bin SimpleInstall) INSTALL_TARGETS(/lib test1 test2 test3 test4) |