Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 535928 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-16 / +16 lines)
Line  Link Here
0
-- Modules/Platform/Darwin-Initialize.cmake
0
++ Modules/Platform/Darwin-Initialize.cmake
Lines 1-16 Link Here
1
# Ask xcode-select where to find /Developer or fall back to ancient location.
1
# Ask xcode-select where to find /Developer or fall back to ancient location.
2
execute_process(COMMAND xcode-select -print-path
2
#execute_process(COMMAND xcode-select -print-path
3
  OUTPUT_VARIABLE _stdout
3
#  OUTPUT_VARIABLE _stdout
4
  OUTPUT_STRIP_TRAILING_WHITESPACE
4
#  OUTPUT_STRIP_TRAILING_WHITESPACE
5
  ERROR_VARIABLE _stderr
5
#  ERROR_VARIABLE _stderr
6
  RESULT_VARIABLE _failed)
6
#  RESULT_VARIABLE _failed)
7
if(NOT _failed AND IS_DIRECTORY ${_stdout})
7
#if(NOT _failed AND IS_DIRECTORY ${_stdout})
8
  set(OSX_DEVELOPER_ROOT ${_stdout})
8
#  set(OSX_DEVELOPER_ROOT ${_stdout})
9
elseif(IS_DIRECTORY "/Developer")
9
#elseif(IS_DIRECTORY "/Developer")
10
  set(OSX_DEVELOPER_ROOT "/Developer")
10
#  set(OSX_DEVELOPER_ROOT "/Developer")
11
else()
11
#else()
12
  set(OSX_DEVELOPER_ROOT "")
12
  set(OSX_DEVELOPER_ROOT "")
13
endif()
13
#endif()
14
14
15
execute_process(COMMAND sw_vers -productVersion
15
execute_process(COMMAND sw_vers -productVersion
16
  OUTPUT_VARIABLE CURRENT_OSX_VERSION
16
  OUTPUT_VARIABLE CURRENT_OSX_VERSION
Lines 91-100 Link Here
91
# CMAKE_OSX_DEPLOYMENT_TARGET
91
# CMAKE_OSX_DEPLOYMENT_TARGET
92
92
93
# Set cache variable - end user may change this during ccmake or cmake-gui configure.
93
# Set cache variable - end user may change this during ccmake or cmake-gui configure.
94
if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
94
#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
95
  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
95
#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
96
    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
96
#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
97
endif()
97
#endif()
98
98
99
#----------------------------------------------------------------------------
99
#----------------------------------------------------------------------------
100
# CMAKE_OSX_SYSROOT
100
# CMAKE_OSX_SYSROOT

Return to bug 535928