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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue Aug 10 12:58:20 2010 UTC (4 years ago) by scarabeus
Branch: MAIN
CVS Tags: HEAD
Changes since 1.1: +0 -0 lines
FILE REMOVED
Drop older stuff.
(Portage version: 2.2_rc67/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.0/Modules/Platform/Darwin.cmake
9 +++ cmake-2.8.0/Modules/Platform/Darwin.cmake
10 @@ -213,19 +213,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 --- cmake-2.8.0/Modules/Platform/UnixPaths.cmake
39 +++ cmake-2.8.0/Modules/Platform/UnixPaths.cmake
40 @@ -33,6 +33,7 @@
41 # search types.
42 LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
43 # Standard
44 + @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@ @GENTOO_PORTAGE_EPREFIX@usr
45 /usr/local / /usr
46
47 # CMake install location
48 @@ -44,43 +45,39 @@
49
50 # List common include file locations not under the common prefixes.
51 LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
52 - # Windows API on Cygwin
53 - /usr/include/w32api
54 -
55 - # X11
56 - /usr/X11R6/include /usr/include/X11
57 -
58 - # Other
59 - /opt/local/include /usr/pkg/include
60 - /opt/csw/include /opt/include
61 - /usr/openwin/include
62 + @GENTOO_PORTAGE_EPREFIX@usr/include
63 )
64
65 LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
66 - # Windows API on Cygwin
67 - /usr/lib/w32api
68 -
69 - # X11
70 - /usr/X11R6/lib /usr/lib/X11
71 -
72 - # Other
73 - /opt/local/lib /usr/pkg/lib
74 - /opt/csw/lib /opt/lib
75 - /usr/openwin/lib
76 + @GENTOO_PORTAGE_GCCLIBDIR@/gcc
77 + @GENTOO_PORTAGE_GCCLIBDIR@
78 + @GENTOO_PORTAGE_EPREFIX@usr/lib64
79 + @GENTOO_PORTAGE_EPREFIX@usr/lib32
80 + @GENTOO_PORTAGE_EPREFIX@usr/lib
81 + @GENTOO_PORTAGE_EPREFIX@lib
82 )
83
84 LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
85 - /usr/pkg/bin
86 + @GENTOO_PORTAGE_EPREFIX@usr/bin
87 + @GENTOO_PORTAGE_EPREFIX@bin
88 )
89
90 LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
91 + @GENTOO_PORTAGE_GCCLIBDIR@/gcc
92 + @GENTOO_PORTAGE_GCCLIBDIR@
93 + @GENTOO_PORTAGE_EPREFIX@usr/lib64
94 + @GENTOO_PORTAGE_EPREFIX@usr/lib32
95 + @GENTOO_PORTAGE_EPREFIX@usr/lib
96 + @GENTOO_PORTAGE_EPREFIX@lib
97 /lib /usr/lib /usr/lib32 /usr/lib64
98 )
99
100 LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
101 + @GENTOO_PORTAGE_EPREFIX@usr/include
102 /usr/include
103 )
104 LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
105 + @GENTOO_PORTAGE_EPREFIX@usr/include
106 /usr/include
107 )
108

  ViewVC Help
Powered by ViewVC 1.1.20