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

Tests: Teach SimpleInstall to use "cmake --build" 

Switch from "ctest --build-and-test" to "cmake --build" to drive the
install and package targets in the SimpleInstall test.
This commit is contained in:
Brad King 2013-11-14 15:11:04 -05:00
parent f2b1d653cf
commit c85672634c
2 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tests/SimpleInstall/CMakeLists.txt
View File

@ -308,7 +308,7 @@ else()
endif()
if(CMAKE_CONFIGURATION_TYPES)
set(SI_CONFIG -C ${CMAKE_CFG_INTDIR})
set(SI_CONFIG --config $<CONFIGURATION>)
else()
set(SI_CONFIG)
endif()
@ -367,7 +367,9 @@ set(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
include(InstallRequiredSystemLibraries)
if(CTEST_TEST_CPACK)
set(PACKAGE_TARGET --build-target package)
set(package_command COMMAND
${CMAKE_COMMAND} --build . --target package ${SI_CONFIG}
)
# Avoid settings that require the .zip file command line tools...
# (just build an NSIS installer without component support)
@ -375,24 +377,19 @@ if(CTEST_TEST_CPACK)
set(CPACK_BINARY_ZIP OFF)
set(CPACK_MONOLITHIC_INSTALL ON)
else()
set(PACKAGE_TARGET)
set(package_command)
endif()
include(CPack)
set(install_command COMMAND
${CMAKE_COMMAND} --build . --target install ${SI_CONFIG}
)
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
${PACKAGE_TARGET}
${install_command}
${package_command}
COMMENT "Install Project"
)

25
Tests/SimpleInstallS2/CMakeLists.txt
View File

@ -308,7 +308,7 @@ else()
endif()
if(CMAKE_CONFIGURATION_TYPES)
set(SI_CONFIG -C ${CMAKE_CFG_INTDIR})
set(SI_CONFIG --config $<CONFIGURATION>)
else()
set(SI_CONFIG)
endif()
@ -367,7 +367,9 @@ set(CMAKE_INSTALL_DEBUG_LIBRARIES 1)
include(InstallRequiredSystemLibraries)
if(CTEST_TEST_CPACK)
set(PACKAGE_TARGET --build-target package)
set(package_command COMMAND
${CMAKE_COMMAND} --build . --target package ${SI_CONFIG}
)
# Avoid settings that require the .zip file command line tools...
# (just build an NSIS installer without component support)
@ -375,24 +377,19 @@ if(CTEST_TEST_CPACK)
set(CPACK_BINARY_ZIP OFF)
set(CPACK_MONOLITHIC_INSTALL ON)
else()
set(PACKAGE_TARGET)
set(package_command)
endif()
include(CPack)
set(install_command COMMAND
${CMAKE_COMMAND} --build . --target install ${SI_CONFIG}
)
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
${PACKAGE_TARGET}
${install_command}
${package_command}
COMMENT "Install Project"
)