Merge pull request #758 from bbenoist/cmake-update
cmake: Update to 2.8.11.2
This commit is contained in:
commit
581aafa283
|
@ -7,7 +7,7 @@ with stdenv.lib;
|
||||||
let
|
let
|
||||||
os = stdenv.lib.optionalString;
|
os = stdenv.lib.optionalString;
|
||||||
majorVersion = "2.8";
|
majorVersion = "2.8";
|
||||||
minorVersion = "9";
|
minorVersion = "11.2";
|
||||||
version = "${majorVersion}.${minorVersion}";
|
version = "${majorVersion}.${minorVersion}";
|
||||||
in
|
in
|
||||||
|
|
||||||
|
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
|
url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
|
||||||
sha256 = "1yg68ng732cfm5c0h91chqwhg06zdh45bybm353kd1myk5rwqgfw";
|
sha256 = "0qh5dhd7ff08n2h569j7g9m92gb3bz14wvhwjhwl7lgx794cnamk";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches =
|
patches =
|
||||||
|
|
|
@ -1,53 +1,54 @@
|
||||||
diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/Linux.cmake cmake-2.8.5/Modules/Platform/Linux.cmake
|
diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake cmake-2.8.11.2/Modules/Platform/Linux.cmake
|
||||||
--- cmake-2.8.5-orig/Modules/Platform/Linux.cmake 2011-07-08 14:21:44.000000000 +0200
|
--- cmake-2.8.11.2-orig/Modules/Platform/Linux.cmake 2013-07-02 15:41:40.000000000 +0200
|
||||||
+++ cmake-2.8.5/Modules/Platform/Linux.cmake 2011-07-21 19:45:00.000000000 +0200
|
+++ cmake-2.8.11.2/Modules/Platform/Linux.cmake 2013-07-15 11:43:30.557888066 +0200
|
||||||
@@ -36,13 +36,13 @@
|
@@ -36,13 +36,8 @@
|
||||||
# checking the platform every time. This option is advanced enough
|
# checking the platform every time. This option is advanced enough
|
||||||
# that only package maintainers should need to adjust it. They are
|
# that only package maintainers should need to adjust it. They are
|
||||||
# capable of providing a setting on the command line.
|
# capable of providing a setting on the command line.
|
||||||
- IF(EXISTS "/etc/debian_version")
|
- if(EXISTS "/etc/debian_version")
|
||||||
- SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
|
- set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
|
||||||
- "Install .so files without execute permission.")
|
- "Install .so files without execute permission.")
|
||||||
- ELSE(EXISTS "/etc/debian_version")
|
- else()
|
||||||
+ #IF(EXISTS "/etc/debian_version")
|
- set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
|
||||||
+ # SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
|
- "Install .so files without execute permission.")
|
||||||
+ # "Install .so files without execute permission.")
|
- endif()
|
||||||
+ #ELSE(EXISTS "/etc/debian_version")
|
+ set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
|
||||||
SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
|
+ "Install .so files without execute permission.")
|
||||||
"Install .so files without execute permission.")
|
endif()
|
||||||
- ENDIF(EXISTS "/etc/debian_version")
|
|
||||||
+ #ENDIF(EXISTS "/etc/debian_version")
|
|
||||||
ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
|
|
||||||
|
|
||||||
# Match multiarch library directory names.
|
# Match multiarch library directory names.
|
||||||
@@ -52,6 +52,6 @@
|
@@ -50,8 +45,3 @@
|
||||||
|
|
||||||
# Debian has lib64 paths only for compatibility so they should not be
|
include(Platform/UnixPaths)
|
||||||
# searched.
|
|
||||||
-IF(EXISTS "/etc/debian_version")
|
-# Debian has lib64 paths only for compatibility so they should not be
|
||||||
- SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
|
-# searched.
|
||||||
-ENDIF(EXISTS "/etc/debian_version")
|
-if(EXISTS "/etc/debian_version")
|
||||||
+#IF(EXISTS "/etc/debian_version")
|
- set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
|
||||||
+# SET_PROPERTY(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE)
|
-endif()
|
||||||
+#ENDIF(EXISTS "/etc/debian_version")
|
diff -ru -x '*~' cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake
|
||||||
diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/Modules/Platform/UnixPaths.cmake
|
--- cmake-2.8.11.2-orig/Modules/Platform/UnixPaths.cmake 2013-07-02 15:41:40.000000000 +0200
|
||||||
--- cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake 2011-07-08 14:21:44.000000000 +0200
|
+++ cmake-2.8.11.2/Modules/Platform/UnixPaths.cmake 2013-07-15 11:42:02.949204549 +0200
|
||||||
+++ cmake-2.8.5/Modules/Platform/UnixPaths.cmake 2011-07-21 19:50:52.000000000 +0200
|
@@ -31,58 +31,13 @@
|
||||||
@@ -33,55 +33,18 @@
|
|
||||||
|
# List common installation prefixes. These will be used for all
|
||||||
# search types.
|
# search types.
|
||||||
LIST(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
-list(APPEND CMAKE_SYSTEM_PREFIX_PATH
|
||||||
# Standard
|
- # Standard
|
||||||
- /usr/local /usr /
|
- /usr/local /usr /
|
||||||
-
|
+list(APPEND CMAKE_SYSTEM_PREFIX_PATH "@glibc@")
|
||||||
|
|
||||||
- # CMake install location
|
- # CMake install location
|
||||||
- "${_CMAKE_INSTALL_DIR}"
|
- "${_CMAKE_INSTALL_DIR}"
|
||||||
-
|
+list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "@glibc@/lib")
|
||||||
|
|
||||||
- # Project install destination.
|
- # Project install destination.
|
||||||
- "${CMAKE_INSTALL_PREFIX}"
|
- "${CMAKE_INSTALL_PREFIX}"
|
||||||
- )
|
- )
|
||||||
-
|
+list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
|
||||||
|
|
||||||
-# List common include file locations not under the common prefixes.
|
-# List common include file locations not under the common prefixes.
|
||||||
-LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
-list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
|
||||||
- # Windows API on Cygwin
|
- # Windows API on Cygwin
|
||||||
- /usr/include/w32api
|
- /usr/include/w32api
|
||||||
-
|
-
|
||||||
|
@ -60,7 +61,7 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
|
||||||
- /usr/openwin/include
|
- /usr/openwin/include
|
||||||
- )
|
- )
|
||||||
-
|
-
|
||||||
-LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
-list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
|
||||||
- # Windows API on Cygwin
|
- # Windows API on Cygwin
|
||||||
- /usr/lib/w32api
|
- /usr/lib/w32api
|
||||||
-
|
-
|
||||||
|
@ -73,23 +74,21 @@ diff -ru -x '*~' cmake-2.8.5-orig/Modules/Platform/UnixPaths.cmake cmake-2.8.5/M
|
||||||
- /usr/openwin/lib
|
- /usr/openwin/lib
|
||||||
- )
|
- )
|
||||||
-
|
-
|
||||||
-LIST(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
-list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
|
||||||
- /usr/pkg/bin
|
- /usr/pkg/bin
|
||||||
+ "@glibc@"
|
- )
|
||||||
)
|
-
|
||||||
|
-list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||||
LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
|
||||||
- /lib /usr/lib /usr/lib32 /usr/lib64
|
- /lib /usr/lib /usr/lib32 /usr/lib64
|
||||||
+ "@glibc@/lib"
|
- )
|
||||||
)
|
-
|
||||||
|
-list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
||||||
LIST(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
|
|
||||||
- /usr/include
|
- /usr/include
|
||||||
+ "@glibc@/include"
|
- )
|
||||||
)
|
-list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
||||||
LIST(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
|
|
||||||
- /usr/include
|
- /usr/include
|
||||||
+ "@glibc@/include"
|
- )
|
||||||
)
|
+list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES "@glibc@/include")
|
||||||
|
|
||||||
# Enable use of lib64 search path variants by default.
|
# Enable use of lib64 search path variants by default.
|
||||||
|
set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS TRUE)
|
||||||
|
|
Loading…
Reference in a new issue