summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2005-02-05 12:50:15 (GMT)
committerBrad King <brad.king@kitware.com>2005-02-05 12:50:15 (GMT)
commitec4fcb87f21132a25a084bff99639205baf74564 (patch)
tree6fdc2486f8a6f5b8767ea64d19ed0f827c29df6d /Tests
parent49bf10e8e94c005197f2afd73f932205a02576cc (diff)
downloadCMake-ec4fcb87f21132a25a084bff99639205baf74564.zip
CMake-ec4fcb87f21132a25a084bff99639205baf74564.tar.gz
CMake-ec4fcb87f21132a25a084bff99639205baf74564.tar.bz2
ENH: Updated post-build command to drive installation through the native build system.
Diffstat (limited to 'Tests')
-rw-r--r--Tests/SimpleInstall/CMakeLists.txt14
-rw-r--r--Tests/SimpleInstallS2/CMakeLists.txt14
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"
)
-
-