77 lines
2.2 KiB
Diff
77 lines
2.2 KiB
Diff
diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake
|
|
--- cmake-3.4.3/Modules/Platform/UnixPaths.cmake 2016-01-25 19:57:19.000000000 +0300
|
|
+++ cmake-3.4.3-new/Modules/Platform/UnixPaths.cmake 2016-04-14 00:20:08.963492213 +0300
|
|
@@ -32,9 +32,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}"
|
|
)
|
|
@@ -53,44 +50,25 @@
|
|
|
|
# List common include file locations not under the common prefixes.
|
|
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
|
- # Windows API on Cygwin
|
|
- /usr/include/w32api
|
|
-
|
|
- # X11
|
|
- /usr/X11R6/include /usr/include/X11
|
|
-
|
|
- # Other
|
|
- /usr/pkg/include
|
|
- /opt/csw/include /opt/include
|
|
- /usr/openwin/include
|
|
+ @libc_dev@/include
|
|
)
|
|
-
|
|
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
|
- # Windows API on Cygwin
|
|
- /usr/lib/w32api
|
|
-
|
|
- # X11
|
|
- /usr/X11R6/lib /usr/lib/X11
|
|
-
|
|
- # Other
|
|
- /usr/pkg/lib
|
|
- /opt/csw/lib /opt/lib
|
|
- /usr/openwin/lib
|
|
+ @libc_lib@/lib
|
|
)
|
|
|
|
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
|
- /usr/pkg/bin
|
|
+ @libc_bin@/bin
|
|
)
|
|
|
|
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 lib64 search path variants by default.
|
|
diff -ur cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake cmake-3.7.2/Modules/Platform/WindowsPaths.cmake
|
|
--- cmake-3.7.2-orig/Modules/Platform/WindowsPaths.cmake 2017-04-26 09:08:39.095674666 -0700
|
|
+++ cmake-3.7.2/Modules/Platform/WindowsPaths.cmake 2017-04-28 22:32:10.379015998 -0700
|
|
@@ -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
|
|
diff -ur cmake-3.7.2-orig/Source/cmFindPackageCommand.cxx cmake-3.7.2/Source/cmFindPackageCommand.cxx
|