[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.96.2.2 1.96.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in changes from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/SimpleInstall/CMakeLists.txt,v
retrieving revision 1.96.2.2
retrieving revision 1.96.2.3
diff -C 2 -d -r1.96.2.2 -r1.96.2.3
*** CMakeLists.txt	25 Mar 2008 23:59:33 -0000	1.96.2.2
--- CMakeLists.txt	25 Jun 2008 13:52:03 -0000	1.96.2.3
***************
*** 356,380 ****
  INCLUDE(CPack)
  
! # Disable packaging test on Apple 10.3 and below.  PackageMaker starts
! # DiskManagementTool as root and disowns it
! # (http://lists.apple.com/archives/installer-dev/2005/Jul/msg00005.html).
! # It is left holding open pipe handles and preventing ProcessUNIX from
! # detecting end-of-data even after its immediate child exits.  Then
! # the test hangs until it times out and is killed.  This is a
! # well-known bug in kwsys process execution that I would love to get
! # time to fix.
! SET(PACKAGE_TARGET --build-target package)
! IF(APPLE AND NOT CTEST_TEST_CPACK)
!   EXECUTE_PROCESS(
!     COMMAND sw_vers -productVersion
!     OUTPUT_VARIABLE OSX_VERSION
!     OUTPUT_STRIP_TRAILING_WHITESPACE
!     )
!   IF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]")
!     MESSAGE(STATUS "Disabling package test on OSX < 10.4")
!     MESSAGE(STATUS "OSX_VERSION='${OSX_VERSION}'")
!     SET(PACKAGE_TARGET)
!   ENDIF("${OSX_VERSION}" MATCHES "^10\\.[0123]" OR "${OSX_VERSION}" MATCHES "ProductVersion:\t10\\.[0123]")
! ENDIF(APPLE AND NOT CTEST_TEST_CPACK)
  
  ADD_CUSTOM_COMMAND(
--- 356,364 ----
  INCLUDE(CPack)
  
! IF(CTEST_TEST_CPACK)
!   SET(PACKAGE_TARGET --build-target package)
! ELSE(CTEST_TEST_CPACK)
!   SET(PACKAGE_TARGET)
! ENDIF(CTEST_TEST_CPACK)
  
  ADD_CUSTOM_COMMAND(