Browse Source

ENH: Updated post-build command to drive installation through the native build system.

Brad King 21 years ago
parent
commit
ec4fcb87f2
2 changed files with 18 additions and 10 deletions
  1. 9 5
      Tests/SimpleInstall/CMakeLists.txt
  2. 9 5
      Tests/SimpleInstallS2/CMakeLists.txt

+ 9 - 5
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"
   )
-
-

+ 9 - 5
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"
   )
-
-