JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
e3d19670a0
nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch

75 lines
2.2 KiB
Diff
Raw Normal View History

cmake: 3.17.3 -> 3.18.0
2020-07-26 16:40:05 +01: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
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
cmake-2_8: fix for multiple outputs
2016-04-13 20:03:48 +01:00
- # Standard
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
- /usr/local /usr /
-
cmake-2_8: fix for multiple outputs
2016-04-13 20:03:48 +01:00
# CMake install location
"${_CMAKE_INSTALL_DIR}"
cmake: remove additional versions
2018-08-13 00:51:01 +01:00
)
cmake: 3.17.3 -> 3.18.0
2020-07-26 16:40:05 +01:00
@@ -47,24 +44,19 @@ endif()
cmake-2_8: fix for multiple outputs
2016-04-13 20:03:48 +01:00
cmake: remove additional versions
2018-08-13 00:51:01 +01:00
# Non "standard" but common install prefixes
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
- /usr/X11R6
- /usr/pkg
- /opt
)
cmake-2_8: fix for multiple outputs
2016-04-13 20:03:48 +01:00
# List common include file locations not under the common prefixes.
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
- # X11
cmake: remove additional versions
2018-08-13 00:51:01 +01:00
- /usr/include/X11
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_dev@/include
cmake-2_8: fix for multiple outputs
2016-04-13 20:03:48 +01:00
)
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
- # X11
cmake: remove additional versions
2018-08-13 00:51:01 +01:00
- /usr/lib/X11
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_lib@/lib
cmake-2_8: fix for multiple outputs
2016-04-13 20:03:48 +01:00
)
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
cmake: remove additional versions
2018-08-13 00:51:01 +01:00
- /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_lib@/lib
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
)
cmake: 3.13.4 -> 3.14.5
2019-06-23 22:44:26 +01:00
if(CMAKE_SYSROOT_COMPILE)
cmake: 3.17.3 -> 3.18.0
2020-07-26 16:40:05 +01:00
@@ -77,15 +69,15 @@ endif()
cmake: 3.13.4 -> 3.14.5
2019-06-23 22:44:26 +01: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"
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_dev@/include
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
)
cmake: 3.13.4 -> 3.14.5
2019-06-23 22:44:26 +01:00
set(_CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES_INIT
${CMAKE_CUDA_IMPLICIT_INCLUDE_DIRECTORIES}
- "${_cmake_sysroot_compile}/usr/include"
cmake: When there is no stdenv.glibc, still fix search paths. Apply all of the fixups from preConfigure as well! For testing purposes I added the following assert: assert (stdenv ? glibc) -> (stdenv.glibc == stdenv.cc.libc); To ensure behavior in the case there is a 'stdenv.glibc' (linux-only?) wasn't changed, which passes in the configurations I could think of. Not including that since it seems like a bad requirement moving forward.
2016-10-13 13:58:54 +01:00
+ @libc_dev@/include
Revert "remove cmake-2.8" Some packages fail with the only cmake version we've left. This reverts commit 67199bda4effafecb977a44c623c2115032dc347.
2015-05-15 21:59:26 +01:00
)
cmake: 3.17.3 -> 3.18.0
2020-07-26 16:40:05 +01: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()
cmake: remove additional versions
2018-08-13 00:51:01 +01: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
Reference in New Issue Copy Permalink