Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[vcpkg_get_cmake_vars,meson] Add OSX_SYSROOT for SDKROOT #5

Closed
wants to merge 1 commit into from
Closed

[vcpkg_get_cmake_vars,meson] Add OSX_SYSROOT for SDKROOT #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions scripts/cmake/vcpkg_configure_meson.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,10 @@ function(vcpkg_configure_meson)
debug_message("Including cmake vars from: ${CMAKE_VARS_FILE}")
include("${CMAKE_VARS_FILE}")

if(APPLE AND NOT DEFINED ENV{SDKROOT})
set(ENV{SDKROOT} "${VCPKG_DETECTED_OSX_SYSROOT}")
endif()

list(APPEND _vcm_OPTIONS --buildtype plain --backend ninja --wrap-mode nodownload)

if(NOT VCPKG_MESON_NATIVE_FILE)
Expand Down
3 changes: 3 additions & 0 deletions scripts/get_cmake_vars/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_SYSTEM_PROCESSOR \"${CMAKE_
# other:
# CMAKE_C_STANDARD
# CMAKE_CXX_STANDARD
if(APPLE)
string(APPEND OUTPUT_STRING "set(${VCPKG_VAR_PREFIX}_OSX_SYSROOT \"${CMAKE_OSX_SYSROOT}\")\n")
endif()

set(PROGLIST AR RANLIB STRIP NM OBJDUMP DLLTOOL MT LINKER)
foreach(prog IN LISTS PROGLIST)
Expand Down