tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/Modules/Platform/Darwin-Initialize.cmake b/Modules/Platform/Darwin-Initialize.cmake
2index 196ab18b0b..31dd4346b1 100644
3--- a/Modules/Platform/Darwin-Initialize.cmake
4+++ b/Modules/Platform/Darwin-Initialize.cmake
5@@ -16,7 +16,7 @@
6 endif()
7
8 if(NOT CMAKE_CROSSCOMPILING)
9- execute_process(COMMAND sw_vers -productVersion
10+ execute_process(COMMAND @sw_vers@ -productVersion
11 OUTPUT_VARIABLE _CMAKE_HOST_OSX_VERSION
12 OUTPUT_STRIP_TRAILING_WHITESPACE)
13 endif()
14diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
15index c65587edbe..0a7cc380c3 100644
16--- a/Source/kwsys/SystemInformation.cxx
17+++ b/Source/kwsys/SystemInformation.cxx
18@@ -3833,7 +3833,7 @@
19 }
20 char const* names[3] = { "Pages wired down:", "Pages active:", nullptr };
21 long long values[2] = { 0 };
22- int ierr = GetFieldsFromCommand("vm_stat", names, values);
23+ int ierr = GetFieldsFromCommand("@vm_stat@", names, values);
24 if (ierr) {
25 return -1;
26 }
27@@ -5586,7 +5586,7 @@
28 {
29 #ifdef __APPLE__
30 std::vector<char const*> args;
31- args.push_back("sw_vers");
32+ args.push_back("@sw_vers@");
33 args.push_back(arg);
34 args.push_back(nullptr);
35 ver = this->RunProcess(args);
36diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
37index 15a1e2c0c3..33bb304cf7 100644
38--- a/Tests/CMakeLists.txt
39+++ b/Tests/CMakeLists.txt
40@@ -1958,7 +1958,7 @@
41 if(CMake_TEST_XCODE_VERSION AND NOT CMake_TEST_XCODE_VERSION VERSION_LESS 5)
42 if(NOT CMake_TEST_XCTest_DEPLOYMENT_TARGET)
43 execute_process(
44- COMMAND sw_vers -productVersion
45+ COMMAND @sw_vers@ -productVersion
46 OUTPUT_VARIABLE OSX_VERSION
47 OUTPUT_STRIP_TRAILING_WHITESPACE
48 )
49diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
50index ddc975c202..8ff651fd90 100644
51--- a/Utilities/cmcurl/CMakeLists.txt
52+++ b/Utilities/cmcurl/CMakeLists.txt
53@@ -127,7 +127,7 @@
54 set(OSX_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET})
55 else()
56 execute_process(
57- COMMAND sw_vers -productVersion
58+ COMMAND @sw_vers@ -productVersion
59 OUTPUT_VARIABLE OSX_VERSION
60 OUTPUT_STRIP_TRAILING_WHITESPACE
61 )