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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Sun Sep 9 19:00:02 2012 UTC (2 years, 8 months ago) by johu
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Remove old.

(Portage version: 2.2.0_alpha124/cvs/Linux x86_64)

1 Set some proper paths to make cmake find our tools.
2 Original patch by Heiko Przybyl
3
4 The ebuild now adds an extra / at the end of $EPREFIX so that it is
5 never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
6 correct)
7
8 --- cmake-2.8.3/Modules/Platform/Darwin.cmake
9 +++ cmake-2.8.3/Modules/Platform/Darwin.cmake
10 @@ -217,19 +217,23 @@
11
12
13
14 -# default to searching for frameworks first
15 -SET(CMAKE_FIND_FRAMEWORK FIRST)
16 +# default to searching for frameworks last
17 +SET(CMAKE_FIND_FRAMEWORK LAST)
18 # set up the default search directories for frameworks
19 SET(CMAKE_SYSTEM_FRAMEWORK_PATH
20 + @GENTOO_PORTAGE_EPREFIX@Frameworks
21 + @GENTOO_PORTAGE_EPREFIX@usr/lib
22 ~/Library/Frameworks
23 /Library/Frameworks
24 /Network/Library/Frameworks
25 /System/Library/Frameworks)
26
27 -# default to searching for application bundles first
28 -SET(CMAKE_FIND_APPBUNDLE FIRST)
29 +# default to searching for application bundles last
30 +SET(CMAKE_FIND_APPBUNDLE LAST)
31 # set up the default search directories for application bundles
32 SET(CMAKE_SYSTEM_APPBUNDLE_PATH
33 + @GENTOO_PORTAGE_EPREFIX@Applications
34 + @GENTOO_PORTAGE_EPREFIX@usr/bin
35 ~/Applications
36 /Applications
37 /Developer/Applications)
38 diff -ruN cmake-2.8.3.orig/Modules/Platform/UnixPaths.cmake cmake-2.8.3/Modules/Platform/UnixPaths.cmake
39 --- cmake-2.8.3/Modules/Platform/UnixPaths.cmake
40 +++ cmake-2.8.3/Modules/Platform/UnixPaths.cmake
41 @@ -33,6 +33,7 @@
42 # search types.
43 LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
44 # Standard
45 + @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
46 /usr/local /usr /
47
48 # CMake install location
49 @@ -44,43 +45,39 @@
50
51 # List common include file locations not under the common prefixes.
52 LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
53 - # Windows API on Cygwin
54 - /usr/include/w32api
55 -
56 - # X11
57 - /usr/X11R6/include /usr/include/X11
58 -
59 - # Other
60 - /usr/pkg/include
61 - /opt/csw/include /opt/include
62 - /usr/openwin/include
63 + @GENTOO_PORTAGE_EPREFIX@usr/include
64 )
65
66 LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
67 - # Windows API on Cygwin
68 - /usr/lib/w32api
69 -
70 - # X11
71 - /usr/X11R6/lib /usr/lib/X11
72 -
73 - # Other
74 - /usr/pkg/lib
75 - /opt/csw/lib /opt/lib
76 - /usr/openwin/lib
77 + @GENTOO_PORTAGE_GCCLIBDIR@/gcc
78 + @GENTOO_PORTAGE_GCCLIBDIR@
79 + @GENTOO_PORTAGE_EPREFIX@usr/lib64
80 + @GENTOO_PORTAGE_EPREFIX@usr/lib32
81 + @GENTOO_PORTAGE_EPREFIX@usr/lib
82 + @GENTOO_PORTAGE_EPREFIX@lib
83 )
84
85 LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
86 - /usr/pkg/bin
87 + @GENTOO_PORTAGE_EPREFIX@usr/bin
88 + @GENTOO_PORTAGE_EPREFIX@bin
89 )
90
91 LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
92 + @GENTOO_PORTAGE_GCCLIBDIR@/gcc
93 + @GENTOO_PORTAGE_GCCLIBDIR@
94 + @GENTOO_PORTAGE_EPREFIX@usr/lib64
95 + @GENTOO_PORTAGE_EPREFIX@usr/lib32
96 + @GENTOO_PORTAGE_EPREFIX@usr/lib
97 + @GENTOO_PORTAGE_EPREFIX@lib
98 /lib /usr/lib /usr/lib32 /usr/lib64
99 )
100
101 LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
102 + @GENTOO_PORTAGE_EPREFIX@usr/include
103 /usr/include
104 )
105 LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
106 + @GENTOO_PORTAGE_EPREFIX@usr/include
107 /usr/include
108 )
109

  ViewVC Help
Powered by ViewVC 1.1.20