/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Jun 9 12:05:26 2013 UTC (18 months, 2 weeks ago) by johu
Branch: MAIN
CVS Tags: HEAD
Version bump by several people in kde overlay. Fixes bug bug #436540.

(Portage version: 2.2.0_alpha177/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

1 From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
2 From: Michael Palimaka <kensington@gentoo.org>
3 Date: Tue, 6 Nov 2012 23:35:34 +1100
4 Subject: [PATCH] Set some proper paths to make cmake find our tools.
5
6 The ebuild now adds an extra / at the end of $EPREFIX so that it is
7 never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
8 correct)
9
10 Original patch by Heiko Przybyl.
11 Updated by Chris Reffett (cmake-2.8.8)
12 Updated by Johannes Huber (cmake-2.8.9)
13 Updated by Michael Palimaka (cmake-2.8.10)
14 Updated by Chris Reffett (cmake-2.8.11)
15
16 --- a/Modules/Platform/Darwin.cmake
17 +++ b/Modules/Platform/Darwin.cmake
18 @@ -252,9 +252,9 @@
19 "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
20
21
22 -# default to searching for frameworks first
23 +# default to searching for frameworks last
24 if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
25 - set(CMAKE_FIND_FRAMEWORK FIRST)
26 + set(CMAKE_FIND_FRAMEWORK LAST)
27 endif()
28
29 # Older OS X linkers do not report their framework search path
30 @@ -276,6 +276,8 @@
31
32 # set up the default search directories for frameworks
33 set(CMAKE_SYSTEM_FRAMEWORK_PATH
34 + @GENTOO_PORTAGE_EPREFIX@Frameworks
35 + @GENTOO_PORTAGE_EPREFIX@usr/lib
36 ~/Library/Frameworks
37 /Library/Frameworks
38 /Network/Library/Frameworks
39 @@ -298,13 +300,15 @@
40 endif()
41 endif()
42
43 -# default to searching for application bundles first
44 +# default to searching for application bundles last
45 if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
46 - set(CMAKE_FIND_APPBUNDLE FIRST)
47 + set(CMAKE_FIND_APPBUNDLE LAST)
48 endif()
49 # set up the default search directories for application bundles
50 set(_apps_paths)
51 foreach(_path
52 + @GENTOO_PORTAGE_EPREFIX@Applications
53 + @GENTOO_PORTAGE_EPREFIX@usr/bin
54 "~/Applications"
55 "/Applications"
56 "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
57 --- a/Modules/Platform/UnixPaths.cmake
58 +++ b/Modules/Platform/UnixPaths.cmake
59 @@ -33,6 +33,7 @@
60 # search types.
61 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
62 # Standard
63 + @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
64 /usr/local /usr /
65
66 # CMake install location
67 @@ -44,43 +45,41 @@
68
69 # List common include file locations not under the common prefixes.
70 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
71 - # Windows API on Cygwin
72 - /usr/include/w32api
73 -
74 - # X11
75 - /usr/X11R6/include /usr/include/X11
76 -
77 - # Other
78 - /usr/pkg/include
79 - /opt/csw/include /opt/include
80 - /usr/openwin/include
81 + @GENTOO_PORTAGE_EPREFIX@usr/include
82 )
83
84 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
85 - # Windows API on Cygwin
86 - /usr/lib/w32api
87 -
88 - # X11
89 - /usr/X11R6/lib /usr/lib/X11
90 -
91 - # Other
92 - /usr/pkg/lib
93 - /opt/csw/lib /opt/lib
94 - /usr/openwin/lib
95 + @GENTOO_PORTAGE_GCCLIBDIR@/gcc
96 + @GENTOO_PORTAGE_GCCLIBDIR@
97 + @GENTOO_PORTAGE_EPREFIX@usr/lib64
98 + @GENTOO_PORTAGE_EPREFIX@usr/libx32
99 + @GENTOO_PORTAGE_EPREFIX@usr/lib32
100 + @GENTOO_PORTAGE_EPREFIX@usr/lib
101 + @GENTOO_PORTAGE_EPREFIX@lib
102 )
103
104 list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
105 - /usr/pkg/bin
106 + @GENTOO_PORTAGE_EPREFIX@usr/bin
107 + @GENTOO_PORTAGE_EPREFIX@bin
108 )
109
110 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
111 - /lib /usr/lib /usr/lib32 /usr/lib64
112 + @GENTOO_PORTAGE_GCCLIBDIR@/gcc
113 + @GENTOO_PORTAGE_GCCLIBDIR@
114 + @GENTOO_PORTAGE_EPREFIX@usr/lib64
115 + @GENTOO_PORTAGE_EPREFIX@usr/libx32
116 + @GENTOO_PORTAGE_EPREFIX@usr/lib32
117 + @GENTOO_PORTAGE_EPREFIX@usr/lib
118 + @GENTOO_PORTAGE_EPREFIX@lib
119 + /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
120 )
121
122 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
123 + @GENTOO_PORTAGE_EPREFIX@usr/include
124 /usr/include
125 )
126 list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
127 + @GENTOO_PORTAGE_EPREFIX@usr/include
128 /usr/include
129 )
130

  ViewVC Help
Powered by ViewVC 1.1.20