SimpleInstall test now builds an installer package if CTEST_TEST_CPACK is ON at the Tests/CMakeLists.txt level.
This commit is contained in:
parent
69fdf711fe
commit
1412cc442e
|
@ -405,6 +405,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=CVS -P ${CMake_SOURCE_DIR}/Utilities/Rel
|
|||
--build-two-config
|
||||
--build-options
|
||||
"-DCMAKE_INSTALL_PREFIX:PATH=${SimpleInstallInstallDir}"
|
||||
"-DCTEST_TEST_CPACK:BOOL=${CTEST_TEST_CPACK}"
|
||||
--test-command ${SimpleInstallInstallDir}/MyTest/bin/SimpleInstExe)
|
||||
LIST(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/SimpleInstall")
|
||||
ADD_TEST(SimpleInstall-Stage2 ${CMAKE_CTEST_COMMAND}
|
||||
|
|
|
@ -364,14 +364,21 @@ SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
|
|||
SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
|
||||
SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
|
||||
INCLUDE(InstallRequiredSystemLibraries)
|
||||
INCLUDE(CPack)
|
||||
|
||||
IF(CTEST_TEST_CPACK)
|
||||
SET(PACKAGE_TARGET --build-target package)
|
||||
|
||||
# Avoid settings that require the .zip file command line tools...
|
||||
# (just build an NSIS installer without component support)
|
||||
#
|
||||
SET(CPACK_BINARY_ZIP OFF)
|
||||
SET(CPACK_MONOLITHIC_INSTALL ON)
|
||||
ELSE(CTEST_TEST_CPACK)
|
||||
SET(PACKAGE_TARGET)
|
||||
ENDIF(CTEST_TEST_CPACK)
|
||||
|
||||
INCLUDE(CPack)
|
||||
|
||||
ADD_CUSTOM_COMMAND(
|
||||
TARGET ${install_target}
|
||||
POST_BUILD
|
||||
|
|
|
@ -364,14 +364,21 @@ SET(CPACK_PACKAGE_EXECUTABLES "SimpleInstall" "Simple Install")
|
|||
SET(CMAKE_INSTALL_MFC_LIBRARIES 1)
|
||||
SET(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
|
||||
INCLUDE(InstallRequiredSystemLibraries)
|
||||
INCLUDE(CPack)
|
||||
|
||||
IF(CTEST_TEST_CPACK)
|
||||
SET(PACKAGE_TARGET --build-target package)
|
||||
|
||||
# Avoid settings that require the .zip file command line tools...
|
||||
# (just build an NSIS installer without component support)
|
||||
#
|
||||
SET(CPACK_BINARY_ZIP OFF)
|
||||
SET(CPACK_MONOLITHIC_INSTALL ON)
|
||||
ELSE(CTEST_TEST_CPACK)
|
||||
SET(PACKAGE_TARGET)
|
||||
ENDIF(CTEST_TEST_CPACK)
|
||||
|
||||
INCLUDE(CPack)
|
||||
|
||||
ADD_CUSTOM_COMMAND(
|
||||
TARGET ${install_target}
|
||||
POST_BUILD
|
||||
|
|
Loading…
Reference in New Issue