kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: the SimpleInstall test also succeeds on the Mac, so maybe Andys

Browse Source 
comment is not valid anymore

Alex
This commit is contained in:
Alexander Neundorf 2007-08-27 14:44:32 -04:00
parent ee9dcc95b4
commit cfd9fdf5de
2 changed files with 32 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
Tests/SimpleInstall/CMakeLists.txt
View File

@ -310,38 +310,19 @@ SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries) INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack) INCLUDE(CPack)
IF(APPLE AND NOT CTEST_TEST_CPACK) ADD_CUSTOM_COMMAND(
# Issue with packaging on the mac, so disable it for now TARGET ${install_target}
ADD_CUSTOM_COMMAND( POST_BUILD
TARGET ${install_target} COMMAND ${CMAKE_CTEST_COMMAND}
POST_BUILD ARGS ${SI_CONFIG}
COMMAND ${CMAKE_CTEST_COMMAND} --build-and-test
ARGS ${SI_CONFIG} ${CMAKE_SOURCE_DIR}
--build-and-test ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR} --build-generator ${CMAKE_GENERATOR}
${CMAKE_BINARY_DIR} --build-project ${PROJECT_NAME}
--build-generator ${CMAKE_GENERATOR} --build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-project ${PROJECT_NAME} --build-noclean
--build-makeprogram ${CMAKE_MAKE_PROGRAM} --build-target install
--build-noclean --build-target package
--build-target install COMMENT "Install Project"
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)

51
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -310,38 +310,19 @@ SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
INCLUDE(InstallRequiredSystemLibraries) INCLUDE(InstallRequiredSystemLibraries)
INCLUDE(CPack) INCLUDE(CPack)
IF(APPLE AND NOT CTEST_TEST_CPACK) ADD_CUSTOM_COMMAND(
# Issue with packaging on the mac, so disable it for now TARGET ${install_target}
ADD_CUSTOM_COMMAND( POST_BUILD
TARGET ${install_target} COMMAND ${CMAKE_CTEST_COMMAND}
POST_BUILD ARGS ${SI_CONFIG}
COMMAND ${CMAKE_CTEST_COMMAND} --build-and-test
ARGS ${SI_CONFIG} ${CMAKE_SOURCE_DIR}
--build-and-test ${CMAKE_BINARY_DIR}
${CMAKE_SOURCE_DIR} --build-generator ${CMAKE_GENERATOR}
${CMAKE_BINARY_DIR} --build-project ${PROJECT_NAME}
--build-generator ${CMAKE_GENERATOR} --build-makeprogram ${CMAKE_MAKE_PROGRAM}
--build-project ${PROJECT_NAME} --build-noclean
--build-makeprogram ${CMAKE_MAKE_PROGRAM} --build-target install
--build-noclean --build-target package
--build-target install COMMENT "Install Project"
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)