nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch

75 lines
2.2 KiB
Diff
Raw Normal View History

2020-07-26 15:40:05 +00:00
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
index b9381c3d7d..cecc40a89e 100644
--- a/Modules/Platform/UnixPaths.cmake
+++ b/Modules/Platform/UnixPaths.cmake
@@ -26,9 +26,6 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
# please make sure to keep Help/variable/CMAKE_SYSTEM_PREFIX_PATH.rst
# synchronized
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
2016-04-13 19:03:48 +00:00
- # Standard
- /usr/local /usr /
-
2016-04-13 19:03:48 +00:00
# CMake install location
"${_CMAKE_INSTALL_DIR}"
2018-08-12 23:51:01 +00:00
)
2020-07-26 15:40:05 +00:00
@@ -47,24 +44,19 @@ endif()
2016-04-13 19:03:48 +00:00
2018-08-12 23:51:01 +00:00
# Non "standard" but common install prefixes
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- /usr/X11R6
- /usr/pkg
- /opt
)
2016-04-13 19:03:48 +00:00
# List common include file locations not under the common prefixes.
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
- # X11
2018-08-12 23:51:01 +00:00
- /usr/include/X11
+ @libc_dev@/include
2016-04-13 19:03:48 +00:00
)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
- # X11
2018-08-12 23:51:01 +00:00
- /usr/lib/X11
+ @libc_lib@/lib
2016-04-13 19:03:48 +00:00
)
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
2018-08-12 23:51:01 +00:00
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
+ @libc_lib@/lib
)
2019-06-23 21:44:26 +00:00
if(CMAKE_SYSROOT_COMPILE)
2020-07-26 15:40:05 +00:00
@@ -77,15 +69,15 @@ endif()
2019-06-23 21:44:26 +00:00
# parsing the implicit directory information from compiler output.
set(_CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES_INIT
${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES}
- "${_cmake_sysroot_compile}/usr/include"
+ @libc_dev@/include
)
set(_CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES_INIT
${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES}
- "${_cmake_sysroot_compile}/usr/include"
+ @libc_dev@/include
)
2019-06-23 21:44:26 +00:00
set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
- "${_cmake_sysroot_compile}/usr/include"
+ @libc_dev@/include
)
2020-07-26 15:40:05 +00:00
unset(_cmake_sysroot_compile)
diff --git a/Modules/Platform/WindowsPaths.cmake b/Modules/Platform/WindowsPaths.cmake
index b9e2f17979..ab517cd4a7 100644
--- a/Modules/Platform/WindowsPaths.cmake
+++ b/Modules/Platform/WindowsPaths.cmake
@@ -70,7 +70,7 @@ endif()
2018-08-12 23:51:01 +00:00
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