[Cmake-commits] [cmake-commits] david.cole committed Darwin.cmake 1.56 1.57

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Feb 17 17:00:01 EST 2009


Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv6584/Modules/Platform

Modified Files:
	Darwin.cmake 
Log Message:
BUG: Allow third component of Mac OSX sw_vers output to be empty. Mac OSX 10.5 was recently reinstalled on dashmacmini3 and pointed out the fact that this expression is faulty when the reported version is simply 10.5 rather than 10.5.x... for example. This fixes it.


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.56
retrieving revision 1.57
diff -C 2 -d -r1.56 -r1.57
*** Darwin.cmake	29 Jan 2009 19:57:38 -0000	1.56
--- Darwin.cmake	17 Feb 2009 21:59:58 -0000	1.57
***************
*** 75,79 ****
  # Set CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT to the current version of OS X
  EXECUTE_PROCESS(COMMAND sw_vers -productVersion OUTPUT_VARIABLE CURRENT_OSX_VERSION)
! STRING(REGEX REPLACE "^.*(10)\\.([0-9]+)\\.([0-9]+).*$" "\\1.\\2"
    CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT ${CURRENT_OSX_VERSION})
  
--- 75,79 ----
  # Set CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT to the current version of OS X
  EXECUTE_PROCESS(COMMAND sw_vers -productVersion OUTPUT_VARIABLE CURRENT_OSX_VERSION)
! STRING(REGEX REPLACE "^.*(10)\\.([0-9]+)\\.*([0-9]+)*.*$" "\\1.\\2"
    CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT ${CURRENT_OSX_VERSION})
  



More information about the Cmake-commits mailing list