/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Apr 23 19:42:17 2013 UTC (2 years, 2 months ago) by grobian
Branch: MAIN
CVS Tags: HEAD
Fix compilation on Darwin, bug #445308

(Portage version: 2.2.01.21890-prefix/cvs/Darwin i386, signed Manifest commit with key 0x5F75F607C5C74E89)

1 Do not detect Xcode and set -isysroot for its SDK, since that messes up
2 our toolchain, and hence makes any compilation fail, bug #445308
3
4 --- Modules/Platform/Darwin.cmake
5 +++ Modules/Platform/Darwin.cmake
6 @@ -60,18 +60,18 @@
7 endif()
8
9 # Ask xcode-select where to find /Developer or fall back to ancient location.
10 -execute_process(COMMAND xcode-select -print-path
11 - OUTPUT_VARIABLE _stdout
12 - OUTPUT_STRIP_TRAILING_WHITESPACE
13 - ERROR_VARIABLE _stderr
14 - RESULT_VARIABLE _failed)
15 -if(NOT _failed AND IS_DIRECTORY ${_stdout})
16 - set(OSX_DEVELOPER_ROOT ${_stdout})
17 -elseif(IS_DIRECTORY "/Developer")
18 - set(OSX_DEVELOPER_ROOT "/Developer")
19 -else()
20 +#execute_process(COMMAND xcode-select -print-path
21 +# OUTPUT_VARIABLE _stdout
22 +# OUTPUT_STRIP_TRAILING_WHITESPACE
23 +# ERROR_VARIABLE _stderr
24 +# RESULT_VARIABLE _failed)
25 +#if(NOT _failed AND IS_DIRECTORY ${_stdout})
26 +# set(OSX_DEVELOPER_ROOT ${_stdout})
27 +#elseif(IS_DIRECTORY "/Developer")
28 +# set(OSX_DEVELOPER_ROOT "/Developer")
29 +#else()
30 set(OSX_DEVELOPER_ROOT "")
31 -endif()
32 +#endif()
33
34 execute_process(COMMAND sw_vers -productVersion
35 OUTPUT_VARIABLE CURRENT_OSX_VERSION
36 @@ -91,10 +91,10 @@
37 # CMAKE_OSX_DEPLOYMENT_TARGET
38
39 # Set cache variable - end user may change this during ccmake or cmake-gui configure.
40 -if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
41 - set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
42 - "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
43 -endif()
44 +#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
45 +# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
46 +# "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
47 +#endif()
48
49 #----------------------------------------------------------------------------
50 # CMAKE_OSX_SYSROOT

  ViewVC Help
Powered by ViewVC 1.1.20