pyrox.dev
1diff --git a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake
2index fe8e003..378512c 100644
3--- a/Modules/Platform/Linux.cmake
4+++ b/Modules/Platform/Linux.cmake
5@@ -36,13 +36,13 @@ else()
6 # checking the platform every time. This option is advanced enough
7 # that only package maintainers should need to adjust it. They are
8 # capable of providing a setting on the command line.
9- if(EXISTS "/etc/debian_version")
10- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
11- "Install .so files without execute permission.")
12- else()
13+ # if(EXISTS "/etc/debian_version")
14+ # set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
15+ # "Install .so files without execute permission.")
16+ # else()
17 set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
18 "Install .so files without execute permission.")
19- endif()
20+ # endif()
21 endif()
22
23 # Match multiarch library directory names.
24@@ -52,6 +52,6 @@ include(Platform/UnixPaths)
25
26 # Debian has lib64 paths only for compatibility so they should not be
27 # searched.
28-if(EXISTS "/etc/debian_version")
29- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
30-endif()
31+# if(EXISTS "/etc/debian_version")
32+# set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
33+#endif()
34diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
35index ccb2663..39834e6 100644
36--- a/Modules/Platform/UnixPaths.cmake
37+++ b/Modules/Platform/UnixPaths.cmake
38@@ -33,55 +33,18 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
39 # search types.
40 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
41 # Standard
42- /usr/local /usr /
43-
44- # CMake install location
45- "${_CMAKE_INSTALL_DIR}"
46-
47- # Project install destination.
48- "${CMAKE_INSTALL_PREFIX}"
49- )
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- )
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- /usr/pkg/lib
74- /opt/csw/lib /opt/lib
75- /usr/openwin/lib
76- )
77-
78-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
79- /usr/pkg/bin
80+ "@glibc@"
81 )
82
83 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
84- /lib /usr/lib /usr/lib32 /usr/lib64
85+ "@glibc@/lib"
86 )
87
88 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
89- /usr/include
90+ "@glibc@/include"
91 )
92 list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
93- /usr/include
94+ "@glibc@/include"
95 )
96
97 # Enable use of lib64 search path variants by default.