mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-09-15 11:50:09 +00:00
cmake: 4.4.2 -> 4.4.3 (#560301)
This commit is contained in:
@@ -1,8 +1,8 @@
|
||||
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
|
||||
index e95da44ea4..bdf4155232 100644
|
||||
index 9aa659e4fd..ba9974c316 100644
|
||||
--- a/Modules/Platform/UnixPaths.cmake
|
||||
+++ b/Modules/Platform/UnixPaths.cmake
|
||||
@@ -71,28 +71,38 @@
|
||||
@@ -81,28 +81,38 @@ list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
|
||||
/lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
|
||||
)
|
||||
|
||||
|
||||
@@ -1,21 +1,21 @@
|
||||
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
|
||||
index 196ab18b0b..31dd4346b1 100644
|
||||
index c9c88b36f5..0b1fda27d7 100644
|
||||
--- a/Modules/Platform/Darwin-Initialize.cmake
|
||||
+++ b/Modules/Platform/Darwin-Initialize.cmake
|
||||
@@ -16,7 +16,7 @@
|
||||
endif()
|
||||
@@ -290,7 +290,7 @@ endif()
|
||||
# CMAKE_OSX_DEPLOYMENT_TARGET
|
||||
|
||||
if(NOT CMAKE_CROSSCOMPILING)
|
||||
- execute_process(COMMAND sw_vers -productVersion
|
||||
+ execute_process(COMMAND @sw_vers@ -productVersion
|
||||
OUTPUT_VARIABLE _CMAKE_HOST_OSX_VERSION
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
endif()
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
RESULT_VARIABLE _result)
|
||||
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
|
||||
index c65587edbe..0a7cc380c3 100644
|
||||
index 743c224437..173ceb0a64 100644
|
||||
--- a/Source/kwsys/SystemInformation.cxx
|
||||
+++ b/Source/kwsys/SystemInformation.cxx
|
||||
@@ -3833,7 +3833,7 @@
|
||||
@@ -3835,7 +3835,7 @@ long long SystemInformationImplementation::GetHostMemoryUsed()
|
||||
}
|
||||
char const* names[3] = { "Pages wired down:", "Pages active:", nullptr };
|
||||
long long values[2] = { 0 };
|
||||
@@ -24,7 +24,7 @@ index c65587edbe..0a7cc380c3 100644
|
||||
if (ierr) {
|
||||
return -1;
|
||||
}
|
||||
@@ -5586,7 +5586,7 @@
|
||||
@@ -5506,7 +5506,7 @@ int SystemInformationImplementation::CallSwVers(char const* arg,
|
||||
{
|
||||
#ifdef __APPLE__
|
||||
std::vector<char const*> args;
|
||||
@@ -34,10 +34,10 @@ index c65587edbe..0a7cc380c3 100644
|
||||
args.push_back(nullptr);
|
||||
ver = this->RunProcess(args);
|
||||
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
|
||||
index 15a1e2c0c3..33bb304cf7 100644
|
||||
index 8020d96833..d32e6a6693 100644
|
||||
--- a/Tests/CMakeLists.txt
|
||||
+++ b/Tests/CMakeLists.txt
|
||||
@@ -1958,7 +1958,7 @@
|
||||
@@ -1977,7 +1977,7 @@ if(BUILD_TESTING)
|
||||
if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5)
|
||||
if(NOT CMake_TEST_XCTest_DEPLOYMENT_TARGET)
|
||||
execute_process(
|
||||
@@ -45,4 +45,4 @@ index 15a1e2c0c3..33bb304cf7 100644
|
||||
+ COMMAND @sw_vers@ -productVersion
|
||||
OUTPUT_VARIABLE OSX_VERSION
|
||||
OUTPUT_STRIP_TRAILING_WHITESPACE
|
||||
)
|
||||
RESULT_VARIABLE _sw_vers_result
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/Modules/CMakeDetermineSystem.cmake b/Modules/CMakeDetermineSystem.cmake
|
||||
index dc26258eac..dd8d30e3d9 100644
|
||||
index c70fea184d..10b18675b0 100644
|
||||
--- a/Modules/CMakeDetermineSystem.cmake
|
||||
+++ b/Modules/CMakeDetermineSystem.cmake
|
||||
@@ -68,7 +68,7 @@
|
||||
@@ -74,7 +74,7 @@ if(CMAKE_HOST_UNIX)
|
||||
endif()
|
||||
if(_CMAKE_APPLE_SILICON_PROCESSOR)
|
||||
if(";${_CMAKE_APPLE_SILICON_PROCESSOR};" MATCHES "^;(arm64|x86_64);$")
|
||||
@@ -12,10 +12,10 @@ index dc26258eac..dd8d30e3d9 100644
|
||||
ERROR_VARIABLE _sysctl_stderr
|
||||
RESULT_VARIABLE _sysctl_result
|
||||
diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
|
||||
index 31dd4346b1..7c4f123a1d 100644
|
||||
index 0b1fda27d7..f5491ef048 100644
|
||||
--- a/Modules/Platform/Darwin-Initialize.cmake
|
||||
+++ b/Modules/Platform/Darwin-Initialize.cmake
|
||||
@@ -28,7 +28,7 @@
|
||||
@@ -22,7 +22,7 @@ set(CMAKE_OSX_ARCHITECTURES "$ENV{CMAKE_OSX_ARCHITECTURES}" CACHE STRING
|
||||
if(NOT CMAKE_CROSSCOMPILING AND
|
||||
CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND
|
||||
CMAKE_HOST_SYSTEM_PROCESSOR MATCHES "^(arm64|x86_64)$")
|
||||
@@ -25,10 +25,10 @@ index 31dd4346b1..7c4f123a1d 100644
|
||||
ERROR_VARIABLE _sysctl_stderr
|
||||
RESULT_VARIABLE _sysctl_result
|
||||
diff --git a/Modules/ProcessorCount.cmake b/Modules/ProcessorCount.cmake
|
||||
index 260b6631c0..ffb8fcd8d2 100644
|
||||
index b8fa1fabc0..7c3112b817 100644
|
||||
--- a/Modules/ProcessorCount.cmake
|
||||
+++ b/Modules/ProcessorCount.cmake
|
||||
@@ -87,8 +87,7 @@
|
||||
@@ -87,8 +87,7 @@ function(ProcessorCount var)
|
||||
|
||||
if(NOT count)
|
||||
# Mac, FreeBSD, OpenBSD (systems with sysctl):
|
||||
@@ -52,10 +52,10 @@ index 8c22b4e43a..6d9ccef5e7 100644
|
||||
#elif defined(__sun) && (defined(__SVR4) || defined(__svr4__)) /* Solaris */
|
||||
# define KWSYSPE_PS_COMMAND "ps -e -o pid,ppid"
|
||||
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
|
||||
index 0a7cc380c3..9923dc4ab9 100644
|
||||
index 173ceb0a64..7bddddf955 100644
|
||||
--- a/Source/kwsys/SystemInformation.cxx
|
||||
+++ b/Source/kwsys/SystemInformation.cxx
|
||||
@@ -3876,7 +3876,7 @@
|
||||
@@ -3878,7 +3878,7 @@ long long SystemInformationImplementation::GetProcMemoryUsed()
|
||||
long long memUsed = 0;
|
||||
pid_t pid = getpid();
|
||||
std::ostringstream oss;
|
||||
@@ -65,10 +65,10 @@ index 0a7cc380c3..9923dc4ab9 100644
|
||||
if (!file) {
|
||||
return -1;
|
||||
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
|
||||
index 33bb304cf7..7dbda40a81 100644
|
||||
index d32e6a6693..683e27ece7 100644
|
||||
--- a/Tests/CMakeLists.txt
|
||||
+++ b/Tests/CMakeLists.txt
|
||||
@@ -216,7 +216,7 @@
|
||||
@@ -249,7 +249,7 @@ if(BUILD_TESTING)
|
||||
endif()
|
||||
|
||||
if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT DEFINED CMake_TEST_APPLE_SILICON)
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
diff --git a/Source/cmFindBase.cxx b/Source/cmFindBase.cxx
|
||||
index b8d4765692..902c1e5290 100644
|
||||
index e9e8dfd4b9..d115cd1897 100644
|
||||
--- a/Source/cmFindBase.cxx
|
||||
+++ b/Source/cmFindBase.cxx
|
||||
@@ -312,6 +312,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
|
||||
@@ -308,6 +308,11 @@ void cmFindBase::FillCMakeEnvironmentPath()
|
||||
// Add CMAKE_*_PATH environment variables
|
||||
std::string var = cmStrCat("CMAKE_", this->CMakePathName, "_PATH");
|
||||
paths.AddEnvPrefixPath("CMAKE_PREFIX_PATH");
|
||||
@@ -15,10 +15,10 @@ index b8d4765692..902c1e5290 100644
|
||||
|
||||
if (this->CMakePathName == "PROGRAM") {
|
||||
diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
|
||||
index 6201894fd1..9533862a2b 100644
|
||||
index 2f2c5c6662..4594afd0e7 100644
|
||||
--- a/Source/cmFindPackageCommand.cxx
|
||||
+++ b/Source/cmFindPackageCommand.cxx
|
||||
@@ -2467,6 +2467,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
|
||||
@@ -2520,6 +2520,7 @@ void cmFindPackageCommand::FillPrefixesCMakeEnvironment()
|
||||
|
||||
// And now the general CMake environment variables
|
||||
paths.AddEnvPath("CMAKE_PREFIX_PATH");
|
||||
|
||||
@@ -52,11 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
+ lib.optionalString isMinimalBuild "-minimal"
|
||||
+ lib.optionalString cursesUI "-cursesUI"
|
||||
+ lib.optionalString qt5UI "-qt5UI";
|
||||
version = "4.4.2";
|
||||
version = "4.4.3";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
|
||||
hash = "sha256-HbnmHmC24IdMhjhjQLkQOC88XnW5+/tE0SIGMSmieJ0=";
|
||||
hash = "sha256-xGQAYYtPHytDUH8k+yLzroMMNBbPI7d24W4dQTqokvA=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user