63 lines
1.9 KiB
Diff
63 lines
1.9 KiB
Diff
|
diff -ur cmake-3.9.1/Modules/Platform/UnixPaths.cmake cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake
|
||
|
|
--- cmake-3.9.1/Modules/Platform/UnixPaths.cmake 2017-08-10 13:36:32.000000000 +0000
|
||
|
|
+++ cmake-3.9.1-mod/Modules/Platform/UnixPaths.cmake 2017-09-03 01:24:31.901473539 +0000
|
||
|
|
@@ -22,9 +22,6 @@
|
||
|
|
# List common installation prefixes. These will be used for all
|
||
|
|
# search types.
|
||
|
|
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||
|
|
- # Standard
|
||
|
|
- /usr/local /usr /
|
||
|
|
-
|
||
|
|
# CMake install location
|
||
|
|
"${_CMAKE_INSTALL_DIR}"
|
||
|
|
)
|
||
|
|
@@ -43,31 +40,26 @@
|
||
|
|
|
||
|
|
# Non "standard" but common install prefixes
|
||
|
|
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||
|
|
- /usr/X11R6
|
||
|
|
- /usr/pkg
|
||
|
|
- /opt
|
||
|
|
)
|
||
|
|
|
||
|
|
# List common include file locations not under the common prefixes.
|
||
|
|
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||
|
|
- # X11
|
||
|
|
- /usr/include/X11
|
||
|
|
+ @libc_dev@/include
|
||
|
|
)
|
||
|
|
|
||
|
|
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||
|
|
- # X11
|
||
|
|
- /usr/lib/X11
|
||
|
|
+ @libc_lib@/lib
|
||
|
|
)
|
||
|
|
|
||
|
|
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||
|
|
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
|
||
|
|
+ @libc_lib@/lib
|
||
|
|
)
|
||
|
|
|
||
|
|
list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||
|
|
- /usr/include
|
||
|
|
+ @libc_dev@/include
|
||
|
|
)
|
||
|
|
list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||
|
|
- /usr/include
|
||
|
|
+ @libc_dev@/include
|
||
|
|
)
|
||
|
|
|
||
|
|
# Enable use of lib32 and lib64 search path variants by default.
|
||
|
|
diff -ur cmake-3.9.1/Modules/Platform/WindowsPaths.cmake cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake
|
||
|
|
--- cmake-3.9.1/Modules/Platform/WindowsPaths.cmake 2017-08-10 13:36:32.000000000 +0000
|
||
|
|
+++ cmake-3.9.1-mod/Modules/Platform/WindowsPaths.cmake 2017-09-03 01:19:32.808355986 +0000
|
||
|
|
@@ -66,7 +66,7 @@
|
||
|
|
|
||
|
|
if(CMAKE_CROSSCOMPILING AND NOT CMAKE_HOST_SYSTEM_NAME MATCHES "Windows")
|
||
|
|
# MinGW (useful when cross compiling from linux with CMAKE_FIND_ROOT_PATH set)
|
||
|
|
- list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||
|
|
+ # list(APPEND CMAKE_SYSTEM_PREFIX_PATH /)
|
||
|
|
endif()
|
||
|
|
|
||
|
|
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|