diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2007-08-27 18:44:32 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2007-08-27 18:44:32 (GMT) |
| commit | cfd9fdf5de3eaa40f2596d28d2c46cc82fe9d9c4 (patch) | |
| tree | fb869206e19d616f506765292dfc777bdb27e82f /Tests/SimpleInstall | |
| parent | ee9dcc95b452903a09e169f2e31f6c94db3b9899 (diff) | |
| download | CMake-cfd9fdf5de3eaa40f2596d28d2c46cc82fe9d9c4.zip CMake-cfd9fdf5de3eaa40f2596d28d2c46cc82fe9d9c4.tar.gz CMake-cfd9fdf5de3eaa40f2596d28d2c46cc82fe9d9c4.tar.bz2 | |
COMP: the SimpleInstall test also succeeds on the Mac, so maybe Andys
comment is not valid anymore
Alex
Diffstat (limited to 'Tests/SimpleInstall')
| -rw-r--r-- | Tests/SimpleInstall/CMakeLists.txt | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 3d619ee..bb1634f 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -310,38 +310,19 @@ SET(CMAKE_INSTALL_MFC_LIBRARIES 1) INCLUDE(InstallRequiredSystemLibraries) INCLUDE(CPack) -IF(APPLE AND NOT CTEST_TEST_CPACK) - # Issue with packaging on the mac, so disable it for now - ADD_CUSTOM_COMMAND( - TARGET ${install_target} - POST_BUILD - COMMAND ${CMAKE_CTEST_COMMAND} - ARGS ${SI_CONFIG} - --build-and-test - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - --build-generator ${CMAKE_GENERATOR} - --build-project ${PROJECT_NAME} - --build-makeprogram ${CMAKE_MAKE_PROGRAM} - --build-noclean - --build-target install - COMMENT "Install Project" - ) -ELSE(APPLE AND NOT CTEST_TEST_CPACK) - ADD_CUSTOM_COMMAND( - TARGET ${install_target} - POST_BUILD - COMMAND ${CMAKE_CTEST_COMMAND} - ARGS ${SI_CONFIG} - --build-and-test - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - --build-generator ${CMAKE_GENERATOR} - --build-project ${PROJECT_NAME} - --build-makeprogram ${CMAKE_MAKE_PROGRAM} - --build-noclean - --build-target install - --build-target package - COMMENT "Install Project" - ) -ENDIF(APPLE AND NOT CTEST_TEST_CPACK) +ADD_CUSTOM_COMMAND( + TARGET ${install_target} + POST_BUILD + COMMAND ${CMAKE_CTEST_COMMAND} + ARGS ${SI_CONFIG} + --build-and-test + ${CMAKE_SOURCE_DIR} + ${CMAKE_BINARY_DIR} + --build-generator ${CMAKE_GENERATOR} + --build-project ${PROJECT_NAME} + --build-makeprogram ${CMAKE_MAKE_PROGRAM} + --build-noclean + --build-target install + --build-target package + COMMENT "Install Project" + ) |