[cmake-commits] alex committed CMakeLists.txt 1.76 1.77

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests/SimpleInstall
In directory public:/mounts/ram/cvs-serv18380

Modified Files:
	CMakeLists.txt 
Log Message:

COMP: the SimpleInstall test also succeeds on the Mac, so maybe Andys
comment is not valid anymore

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- CMakeLists.txt	2 Jul 2007 13:58:08 -0000	1.76
+++ CMakeLists.txt	27 Aug 2007 18:44:32 -0000	1.77
@@ -310,38 +310,19 @@
 INCLUDE(InstallRequiredSystemLibraries)
 INCLUDE(CPack)
 
-IF(APPLE AND NOT CTEST_TEST_CPACK)
-  # Issue with packaging on the mac, so disable it for now
-  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
-    COMMENT "Install Project"
-    )
-ELSE(APPLE AND NOT CTEST_TEST_CPACK)
-  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
-    --build-target package
-    COMMENT "Install Project"
-    )
-ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
+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
+  --build-target package
+  COMMENT "Install Project"
+  )