瀏覽代碼

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.

David Cole 17 年之前
父節點
當前提交
75fb6798ab
共有 1 個文件被更改,包括 8 次插入8 次删除
  1. 8 8
      Modules/Platform/Darwin.cmake

+ 8 - 8
Modules/Platform/Darwin.cmake

@@ -103,24 +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_VALUE "${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}")
+  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}")
+  SET(CMAKE_OSX_SYSROOT_VALUE ${ENV_SDKROOT})
 ELSE(NOT ENV_SDKROOT STREQUAL "")
-  SET(CMAKE_OSX_SYSROOT_VALUE "${CMAKE_OSX_SYSROOT_DEFAULT}")
+  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
+  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 
+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.")
 
 #----------------------------------------------------------------------------
@@ -158,11 +158,11 @@ SET(CMAKE_OSX_ARCHITECTURES_DEFAULT ${_CMAKE_OSX_MACHINE})
 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}")
+  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
+SET(CMAKE_OSX_ARCHITECTURES ${CMAKE_OSX_ARCHITECTURES_VALUE} CACHE STRING
   "Build architectures for OSX")