From ec4fcb87f21132a25a084bff99639205baf74564 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sat, 5 Feb 2005 07:50:15 -0500 Subject: ENH: Updated post-build command to drive installation through the native build system. --- Tests/SimpleInstall/CMakeLists.txt | 14 +++++++++----- Tests/SimpleInstallS2/CMakeLists.txt | 14 +++++++++----- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/Tests/SimpleInstall/CMakeLists.txt b/Tests/SimpleInstall/CMakeLists.txt index 10ce2c7..2680ddd 100644 --- a/Tests/SimpleInstall/CMakeLists.txt +++ b/Tests/SimpleInstall/CMakeLists.txt @@ -70,10 +70,14 @@ ENDIF(STAGE2) ADD_CUSTOM_COMMAND( TARGET ${install_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -DBUILD_TYPE:STRING=${CMAKE_CFG_INTDIR} - -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake" + COMMAND ${CMAKE_CTEST_COMMAND} + ARGS --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" ) - - diff --git a/Tests/SimpleInstallS2/CMakeLists.txt b/Tests/SimpleInstallS2/CMakeLists.txt index 10ce2c7..2680ddd 100644 --- a/Tests/SimpleInstallS2/CMakeLists.txt +++ b/Tests/SimpleInstallS2/CMakeLists.txt @@ -70,10 +70,14 @@ ENDIF(STAGE2) ADD_CUSTOM_COMMAND( TARGET ${install_target} POST_BUILD - COMMAND ${CMAKE_COMMAND} - ARGS -DBUILD_TYPE:STRING=${CMAKE_CFG_INTDIR} - -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_install.cmake" + COMMAND ${CMAKE_CTEST_COMMAND} + ARGS --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" ) - - -- cgit v0.12