mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:33:03 +03:00
cmake: Prevent it from looking for packages in /
when cross-compiling for Windows.
This commit is contained in:
parent
68d7c42247
commit
934ed02750
@ -62,3 +62,16 @@ diff -ru3 cmake-3.4.3/Modules/Platform/UnixPaths.cmake cmake-3.4.3-new/Modules/P
|
|||||||
)
|
)
|
||||||
|
|
||||||
# Enable use of lib64 search path variants by default.
|
# 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
|
||||||
|
Loading…
Reference in New Issue
Block a user