alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
nixpkgs/pkgs/development/tools/build-managers/cmake/search-path.patch

78 lines
2.4 KiB
Diff
Raw Normal View History

cmake: remove additional versions
2018-08-13 00:51:01 +01:00
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 @@
cmake-2_8: fix for multiple outputs
2016-04-13 20:03:48 +01:00
# List common installation prefixes. These will be used for all
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
# search types.
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
)
@@ -43,31 +40,26 @@
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)
set(_cmake_sysroot_compile "${CMAKE_SYSROOT_COMPILE}")
else()
set(_cmake_sysroot_compile "${CMAKE_SYSROOT}")
endif()
# Default per-language values. These may be later replaced after
# 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: remove additional versions
2018-08-13 00:51:01 +01:00
# 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
Copy permalink