ENH: Add testing for cpack
This commit is contained in:
parent
bde71e9668
commit
cd62290147
|
@ -145,6 +145,8 @@ ENDIF(WIN32 AND NOT UNIX)
|
||||||
SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
|
SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
|
||||||
INCLUDE(CPack)
|
INCLUDE(CPack)
|
||||||
|
|
||||||
|
IF(APPLE AND NOT CTEST_TEST_CPACK)
|
||||||
|
# Issue with packaging on the mac, so disable it for now
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
TARGET ${install_target}
|
TARGET ${install_target}
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
|
@ -158,6 +160,23 @@ ADD_CUSTOM_COMMAND(
|
||||||
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
|
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
|
||||||
--build-noclean
|
--build-noclean
|
||||||
--build-target install
|
--build-target install
|
||||||
# --build-target package
|
|
||||||
COMMENT "Install Project"
|
COMMENT "Install Project"
|
||||||
)
|
)
|
||||||
|
ELSE(APPLE 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 NOT CTEST_TEST_CPACK)
|
||||||
|
|
|
@ -145,6 +145,8 @@ ENDIF(WIN32 AND NOT UNIX)
|
||||||
SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
|
SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
|
||||||
INCLUDE(CPack)
|
INCLUDE(CPack)
|
||||||
|
|
||||||
|
IF(APPLE AND NOT CTEST_TEST_CPACK)
|
||||||
|
# Issue with packaging on the mac, so disable it for now
|
||||||
ADD_CUSTOM_COMMAND(
|
ADD_CUSTOM_COMMAND(
|
||||||
TARGET ${install_target}
|
TARGET ${install_target}
|
||||||
POST_BUILD
|
POST_BUILD
|
||||||
|
@ -158,6 +160,23 @@ ADD_CUSTOM_COMMAND(
|
||||||
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
|
--build-makeprogram ${CMAKE_MAKE_PROGRAM}
|
||||||
--build-noclean
|
--build-noclean
|
||||||
--build-target install
|
--build-target install
|
||||||
# --build-target package
|
|
||||||
COMMENT "Install Project"
|
COMMENT "Install Project"
|
||||||
)
|
)
|
||||||
|
ELSE(APPLE 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 NOT CTEST_TEST_CPACK)
|
||||||
|
|
Loading…
Reference in New Issue