pyrox.dev
1diff -ru3 cmake-2.8.12.2/Modules/Platform/Linux.cmake cmake-2.8.12.2-new/Modules/Platform/Linux.cmake
2--- cmake-2.8.12.2/Modules/Platform/Linux.cmake 2014-01-16 21:15:08.000000000 +0400
3+++ cmake-2.8.12.2-new/Modules/Platform/Linux.cmake 2016-04-13 22:00:32.928575740 +0300
4@@ -36,22 +36,11 @@
5 # checking the platform every time. This option is advanced enough
6 # that only package maintainers should need to adjust it. They are
7 # capable of providing a setting on the command line.
8- if(EXISTS "/etc/debian_version")
9- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
10- "Install .so files without execute permission.")
11- else()
12- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
13- "Install .so files without execute permission.")
14- endif()
15+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
16+ "Install .so files without execute permission.")
17 endif()
18
19 # Match multiarch library directory names.
20 set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-linux-gnu[a-z0-9_]*")
21
22 include(Platform/UnixPaths)
23-
24-# Debian has lib64 paths only for compatibility so they should not be
25-# searched.
26-if(EXISTS "/etc/debian_version")
27- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
28-endif()
29diff -ru3 cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake
30--- cmake-2.8.12.2/Modules/Platform/UnixPaths.cmake 2014-01-16 21:15:08.000000000 +0400
31+++ cmake-2.8.12.2-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:09:10.106362636 +0300
32@@ -32,9 +32,6 @@
33 # List common installation prefixes. These will be used for all
34 # search types.
35 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
36- # Standard
37- /usr/local /usr /
38-
39 # CMake install location
40 "${_CMAKE_INSTALL_DIR}"
41
42@@ -44,44 +41,26 @@
43
44 # List common include file locations not under the common prefixes.
45 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
46- # Windows API on Cygwin
47- /usr/include/w32api
48-
49- # X11
50- /usr/X11R6/include /usr/include/X11
51-
52- # Other
53- /usr/pkg/include
54- /opt/csw/include /opt/include
55- /usr/openwin/include
56+ @libc_dev@/include
57 )
58
59 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
60- # Windows API on Cygwin
61- /usr/lib/w32api
62-
63- # X11
64- /usr/X11R6/lib /usr/lib/X11
65-
66- # Other
67- /usr/pkg/lib
68- /opt/csw/lib /opt/lib
69- /usr/openwin/lib
70+ @libc_lib@/lib
71 )
72
73 list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
74- /usr/pkg/bin
75+ @libc_bin@/bin
76 )
77
78 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
79- /lib /usr/lib /usr/lib32 /usr/lib64
80+ @libc_lib@/lib
81 )
82
83 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
84- /usr/include
85+ @libc_dev@/include
86 )
87 list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
88- /usr/include
89+ @libc_dev@/include
90 )
91
92 # Enable use of lib64 search path variants by default.