[cmake-commits] alex committed CMakeLists.txt 1.82 1.83

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Sep 17 16:21:26 EDT 2007


Update of /cvsroot/CMake/CMake/Tests/SimpleInstallS2
In directory public:/mounts/ram/cvs-serv31931

Modified Files:
	CMakeLists.txt 
Log Message:

COMP: disable packaging test on Apple, see if this fixes the timeouts

Alex


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstallS2/CMakeLists.txt,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- CMakeLists.txt	17 Sep 2007 19:27:59 -0000	1.82
+++ CMakeLists.txt	17 Sep 2007 20:21:24 -0000	1.83
@@ -333,6 +333,13 @@
 INCLUDE(InstallRequiredSystemLibraries)
 INCLUDE(CPack)
 
+# disable packaging on Apple, since this includes the /Applications dir
+# where a symbolic link is created by cmCPackOSXX11Generator.cxx
+SET(PACKAGE_TARGET --build-target package)
+IF(APPLE AND NOT CTEST_TEST_CPACK)
+  SET(PACKAGE_TARGET)
+ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
+
 ADD_CUSTOM_COMMAND(
   TARGET ${install_target}
   POST_BUILD
@@ -346,6 +353,6 @@
   --build-makeprogram ${CMAKE_MAKE_PROGRAM}
   --build-noclean
   --build-target install
-  --build-target package
+  ${PACKAGE_TARGET}
   COMMENT "Install Project"
   )



More information about the Cmake-commits mailing list