Преглед изворни кода

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...

David Cole пре 17 година
родитељ
комит
9e3705b5b8
1 измењених фајлова са 12 додато и 6 уклоњено
  1. 12 6
      Modules/Platform/Darwin.cmake

+ 12 - 6
Modules/Platform/Darwin.cmake

@@ -103,20 +103,24 @@ SET(ENV_SDKROOT "$ENV{SDKROOT}")
 # See if we need to override the default SDK or Deployment target with the
 # environment variables
 IF(NOT ENV_MACOSX_DEPLOYMENT_TARGET STREQUAL "")
-  SET(CMAKE_OSX_DEPLOYMENT_TARGET_DEFAULT "${ENV_MACOSX_DEPLOYMENT_TARGET}")
+  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_DEFAULT "${ENV_SDKROOT}")
+  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_DEFAULT}" CACHE STRING
+  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_DEFAULT}"  CACHE PATH 
+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.")
 
 #----------------------------------------------------------------------------
@@ -152,11 +156,13 @@ SET(CMAKE_OSX_ARCHITECTURES_DEFAULT ${_CMAKE_OSX_MACHINE})
 # check for environment variable CMAKE_OSX_ARCHITECTURES
 # if it is set.
 IF(NOT "$ENV{CMAKE_OSX_ARCHITECTURES}" STREQUAL "")
-  SET(CMAKE_OSX_ARCHITECTURES_DEFAULT "$ENV{CMAKE_OSX_ARCHITECTURES}")
+  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_DEFAULT}" CACHE STRING
+SET(CMAKE_OSX_ARCHITECTURES "${CMAKE_OSX_ARCHITECTURES_VALUE}" CACHE STRING
   "Build architectures for OSX")