pyrox.dev
cmake: add all glibc outputs to system prefix
+24
-34
pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
+24
-34
pkgs/development/tools/build-managers/cmake/search-path-3.2.patch
···
1
-
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
2
-
index 20ee1d1..39834e6 100644
3
-
--- a/Modules/Platform/UnixPaths.cmake
4
-
+++ b/Modules/Platform/UnixPaths.cmake
5
-
@@ -33,64 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
6
# search types.
7
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
8
-
# Standard
9
- /usr/local /usr /
10
-
11
-
- # CMake install location
12
-
- "${_CMAKE_INSTALL_DIR}"
13
-
- )
14
-
-if (NOT CMAKE_FIND_NO_INSTALL_PREFIX)
15
-
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
16
-
- # Project install destination.
17
-
- "${CMAKE_INSTALL_PREFIX}"
18
-
- )
19
-
- if(CMAKE_STAGING_PREFIX)
20
-
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH
21
-
- # User-supplied staging prefix.
22
-
- "${CMAKE_STAGING_PREFIX}"
23
-
- )
24
-
- endif()
25
-
-endif()
26
-
-
27
-
-# List common include file locations not under the common prefixes.
28
-
-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
29
- # Windows API on Cygwin
30
- /usr/include/w32api
31
-
···
36
- /usr/pkg/include
37
- /opt/csw/include /opt/include
38
- /usr/openwin/include
39
-
- )
40
-
41
-
-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
42
- # Windows API on Cygwin
43
- /usr/lib/w32api
44
-
···
49
- /usr/pkg/lib
50
- /opt/csw/lib /opt/lib
51
- /usr/openwin/lib
52
-
- )
53
-
-
54
-
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
55
- /usr/pkg/bin
56
-
+ "@glibc_bin@"
57
)
58
59
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
60
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
61
-
+ "@glibc_lib@/lib"
62
)
63
64
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
65
- /usr/include
66
-
+ "@glibc_dev@/include"
67
)
68
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
69
- /usr/include
70
-
+ "@glibc_dev@/include"
71
)
72
73
# Enable use of lib64 search path variants by default.
74
-
···
1
+
diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake
2
+
--- cmake-3.4.3/Modules/Platform/UnixPaths.cmake 2016-01-25 19:57:19.000000000 +0300
3
+
+++ cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:20:08.963492213 +0300
4
+
@@ -32,9 +32,6 @@
5
+
# List common installation prefixes. These will be used for all
6
# search types.
7
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
8
+
- # Standard
9
- /usr/local /usr /
10
-
11
+
# CMake install location
12
+
"${_CMAKE_INSTALL_DIR}"
13
+
)
14
+
@@ -53,44 +50,25 @@
15
+
16
+
# List common include file locations not under the common prefixes.
17
+
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
18
- # Windows API on Cygwin
19
- /usr/include/w32api
20
-
···
25
- /usr/pkg/include
26
- /opt/csw/include /opt/include
27
- /usr/openwin/include
28
+
+ @glibc_dev@/include
29
+
)
30
-
31
+
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
32
- # Windows API on Cygwin
33
- /usr/lib/w32api
34
-
···
39
- /usr/pkg/lib
40
- /opt/csw/lib /opt/lib
41
- /usr/openwin/lib
42
+
+ @glibc_lib@/lib
43
+
)
44
+
45
+
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
46
- /usr/pkg/bin
47
+
+ @glibc_bin@/bin
48
)
49
50
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
51
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
52
+
+ @glibc_lib@/lib
53
)
54
55
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
56
- /usr/include
57
+
+ @glibc_dev@/include
58
)
59
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
60
- /usr/include
61
+
+ @glibc_dev@/include
62
)
63
64
# Enable use of lib64 search path variants by default.