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

[cmake-commits at cmake.org]

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

Modified Files:
	Darwin.cmake 
Log Message:
BUG: Remove unnecessary double quotes from SET statements. Hopefully resolves the strange and difficult to diagnose (or reproduce) test failures on the dashmacmini2 Continuous dashboard.


Index: Darwin.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Darwin.cmake,v
retrieving revision 1.55
retrieving revision 1.56
diff -C 2 -d -r1.55 -r1.56
*** Darwin.cmake	29 Jan 2009 18:41:58 -0000	1.55
--- Darwin.cmake	29 Jan 2009 19:57:38 -0000	1.56
***************
*** 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.")
  
--- 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.")
  
***************
*** 159,167 ****
    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")
  
--- 159,167 ----
    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")