Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[scripts/get_cmake_vars][scripts/ports.cmake] fix CMake4 on OSX (#44712)

Browse Source 
Co-authored-by: Nicole Patricia Mazzuca <nicole@strega-nil.co>
This commit is contained in:
Nicole Mazzuca
2025-04-02 21:20:07 +02:00
committed by GitHub
parent 460551b0ec
commit a1aebfa9d5
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/get_cmake_vars/CMakeLists.txt
View File

@@ -146,7 +146,9 @@ macro(_vcpkg_adjust_flags flag_var)
string(APPEND ${flag_var} " -arch ${arch}")
endforeach()
endif()
string(APPEND ${flag_var} " -isysroot ${CMAKE_OSX_SYSROOT}")
if(CMAKE_OSX_SYSROOT)
string(APPEND ${flag_var} " -isysroot \"${CMAKE_OSX_SYSROOT}\"")
endif()
if (CMAKE_OSX_DEPLOYMENT_TARGET)
list(GET VCPKG_LANGUAGES 0 lang)
string(APPEND ${flag_var} " ${CMAKE_${lang}_OSX_DEPLOYMENT_TARGET_FLAG}${CMAKE_OSX_DEPLOYMENT_TARGET}")

3
scripts/ports.cmake
View File

@@ -3,6 +3,9 @@ if(POLICY CMP0174)
# Use CMake 3.31 behavior for cmake_parse_arguments(PARSE_ARGV)
cmake_policy(SET CMP0174 NEW)
endif()
if(CMAKE_VERSION VERSION_GREATER_EQUAL "4.0")
set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)
endif()
# Remove CMAKE_ variables from the script call
foreach(i RANGE 0 "${CMAKE_ARGC}")