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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.2 - (show annotations) (download)
Tue May 21 18:19:35 2013 UTC (15 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_alpha176/cvs/Linux x86_64, signed Manifest commit with key F3CFD2BD)

1 From 3f5fa933d17e24cafd75ae28c00f4fc0292eae92 Mon Sep 17 00:00:00 2001
2 From: Johannes Huber <johu@gentoo.org>
3 Date: Wed, 15 Aug 2012 14:42:16 +0200
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 Update by Johannes Huber (cmake-2.8.9)
13 ---
14 Modules/Platform/Darwin.cmake | 12 +++++++----
15 Modules/Platform/UnixPaths.cmake | 43 +++++++++++++++++++-------------------
16 2 files changed, 29 insertions(+), 26 deletions(-)
17
18 diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
19 index eff07b2..cbedc47 100644
20 --- a/Modules/Platform/Darwin.cmake
21 +++ b/Modules/Platform/Darwin.cmake
22 @@ -228,24 +228,28 @@ SET(CMAKE_CXX_CREATE_MACOSX_FRAMEWORK
23 "<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>")
24
25
26 -# default to searching for frameworks first
27 +# default to searching for frameworks last
28 IF(NOT DEFINED CMAKE_FIND_FRAMEWORK)
29 - SET(CMAKE_FIND_FRAMEWORK FIRST)
30 + SET(CMAKE_FIND_FRAMEWORK LAST)
31 ENDIF()
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 /System/Library/Frameworks)
40
41 -# default to searching for application bundles first
42 +# default to searching for application bundles last
43 IF(NOT DEFINED CMAKE_FIND_APPBUNDLE)
44 - SET(CMAKE_FIND_APPBUNDLE FIRST)
45 + SET(CMAKE_FIND_APPBUNDLE LAST)
46 ENDIF()
47 # set up the default search directories for application bundles
48 SET(_apps_paths)
49 FOREACH(_path
50 + @GENTOO_PORTAGE_EPREFIX@Applications
51 + @GENTOO_PORTAGE_EPREFIX@usr/bin
52 "~/Applications"
53 "/Applications"
54 "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
55 diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
56 index 5ee7ddb..961746d 100644
57 --- a/Modules/Platform/UnixPaths.cmake
58 +++ b/Modules/Platform/UnixPaths.cmake
59 @@ -33,6 +33,7 @@ GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
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 @@ LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
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
131 --
132 1.7.9.7

  ViewVC Help
Powered by ViewVC 1.1.20