[Cmake-commits] [cmake-commits] david.cole committed CMakeCCompiler.cmake.in 1.24 1.25 CMakeCXXCompiler.cmake.in 1.24 1.25

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeCCompiler.cmake.in CMakeCXXCompiler.cmake.in 
Log Message:
Fix issue #10155 - default value of CMAKE_OSX_DEPLOYMENT_TARGET should always be the empty string. When the value of CMAKE_OSX_DEPLOYMENT_TARGET is the empty string, the -mmacosx-version-min flag should not show up on the compiler command line. The logic for selecting default value of CMAKE_OSX_SYSROOT is orthogonal to and independent of the value of the deployment target. The default value for CMAKE_OSX_SYSROOT is the SDK that corresponds to the current version of Mac OSX on which cmake is running.


Index: CMakeCXXCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCXXCompiler.cmake.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeCXXCompiler.cmake.in	22 Jan 2010 17:41:55 -0000	1.24
--- CMakeCXXCompiler.cmake.in	29 Jan 2010 16:56:32 -0000	1.25
***************
*** 40,43 ****
--- 40,44 ----
  
  SET(CMAKE_CXX_HAS_ISYSROOT "@CMAKE_CXX_HAS_ISYSROOT@")
+ @CMAKE_CXX_OSX_DEPLOYMENT_TARGET_FLAG_CODE@
  
  SET(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "@CMAKE_CXX_IMPLICIT_LINK_LIBRARIES@")

Index: CMakeCCompiler.cmake.in
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeCCompiler.cmake.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** CMakeCCompiler.cmake.in	22 Jan 2010 17:41:55 -0000	1.24
--- CMakeCCompiler.cmake.in	29 Jan 2010 16:56:31 -0000	1.25
***************
*** 39,42 ****
--- 39,43 ----
  
  SET(CMAKE_C_HAS_ISYSROOT "@CMAKE_C_HAS_ISYSROOT@")
+ @CMAKE_C_OSX_DEPLOYMENT_TARGET_FLAG_CODE@
  
  SET(CMAKE_C_IMPLICIT_LINK_LIBRARIES "@CMAKE_C_IMPLICIT_LINK_LIBRARIES@")