[Cmake-commits] [cmake-commits] david.cole committed Darwin.cmake 1.52 1.53

[cmake-commits at cmake.org]

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

Modified Files:
	Darwin.cmake 
Log Message:
BUG: Try to fix the universal binary continuous dashboard on dashmacmini2. I am deducing that the value of CMAKE_OSX_ARCHITECTURES_DEFAULT is responsible for the failure, although I cannot reproduce it on other builds or even by running the test via ctest interactively *on* the continuous dashboard's build...


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.52
retrieving revision 1.53
diff -C 2 -d -r1.52 -r1.53
*** Darwin.cmake	27 Jan 2009 16:50:41 -0000	1.52
--- Darwin.cmake	27 Jan 2009 20:51:43 -0000	1.53
***************
*** 104,121 ****
  # environment variables
  IF(NOT ENV_MACOSX_DEPLOYMENT_TARGET STREQUAL "")
!   SET(CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT "${ENV_MACOSX_DEPLOYMENT_TARGET}")
  ENDIF(NOT ENV_MACOSX_DEPLOYMENT_TARGET STREQUAL "")
  
  IF(NOT ENV_SDKROOT STREQUAL "")
!   SET(CMAKE_OSX_SYSROOT_DEFAULT "${ENV_SDKROOT}")
  ENDIF(NOT ENV_SDKROOT STREQUAL "")
  
  # Set cache variables - end user may change these during ccmake or cmake-gui configure.
  IF(CURRENT_OSX_VERSION GREATER 10.3)
!   SET(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT}" CACHE STRING
      "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
  ENDIF(CURRENT_OSX_VERSION GREATER 10.3)
  
! SET(CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT_DEFAULT}"  CACHE PATH 
    "The product will be built against the headers and libraries located inside the indicated SDK.")
  
--- 104,125 ----
  # environment variables
  IF(NOT ENV_MACOSX_DEPLOYMENT_TARGET STREQUAL "")
!   SET(CMAKE_OSX_DEPLOYMENT_TARGET_VALUE "${ENV_MACOSX_DEPLOYMENT_TARGET}")
! ELSE(NOT ENV_MACOSX_DEPLOYMENT_TARGET STREQUAL "")
!   SET(CMAKE_OSX_DEPLOYMENT_TARGET_VALUE "${CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT}")
  ENDIF(NOT ENV_MACOSX_DEPLOYMENT_TARGET STREQUAL "")
  
  IF(NOT ENV_SDKROOT STREQUAL "")
!   SET(CMAKE_OSX_SYSROOT_VALUE "${ENV_SDKROOT}")
! ELSE(NOT ENV_SDKROOT STREQUAL "")
!   SET(CMAKE_OSX_SYSROOT_VALUE "${CMAKE_OSX_SYSROOT_DEFAULT}")
  ENDIF(NOT ENV_SDKROOT STREQUAL "")
  
  # Set cache variables - end user may change these during ccmake or cmake-gui configure.
  IF(CURRENT_OSX_VERSION GREATER 10.3)
!   SET(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_OSX_DEPLOYMENT_TARGET_VALUE}" CACHE STRING
      "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
  ENDIF(CURRENT_OSX_VERSION GREATER 10.3)
  
! SET(CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT_VALUE}"  CACHE PATH 
    "The product will be built against the headers and libraries located inside the indicated SDK.")
  
***************
*** 153,161 ****
  # if it is set.
  IF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
!   SET(CMAKE_OSX_ARCHITECTURES_DEFAULT "$ENV{CMAKE_OSX_ARCHITECTURES}")
  ENDIF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
  
  # now put _CMAKE_OSX_MACHINE into the cache
! SET(CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES_DEFAULT}" CACHE STRING
    "Build architectures for OSX")
  
--- 157,167 ----
  # if it is set.
  IF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
!   SET(CMAKE_OSX_ARCHITECTURES_VALUE "$ENV{CMAKE_OSX_ARCHITECTURES}")
! ELSE(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
!   SET(CMAKE_OSX_ARCHITECTURES_VALUE "{CMAKE_OSX_ARCHITECTURES_DEFAULT}")
  ENDIF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
  
  # now put _CMAKE_OSX_MACHINE into the cache
! SET(CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES_VALUE}" CACHE STRING
    "Build architectures for OSX")