mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-19 16:13:16 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg CMake] Fix for #18529 that broke iOS compilation (#23989)

Browse Source 
* Fix for #18529 that broke iOS compilation

Fix based on https://github.com/microsoft/vcpkg/pull/23001

* Updated version database
This commit is contained in:
Christophe Calmejane 2022-04-07 01:05:16 +02:00 committed by GitHub
parent cc2dd8fed3
commit 436d98da7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/vcpkg-cmake/cmake_get_vars/CMakeLists.txt
View File

@ -101,7 +101,11 @@ if(APPLE)
string(APPEND EXTRA_FLAGS " -arch ${arch}")
endforeach()
if(CMAKE_OSX_DEPLOYMENT_TARGET)
string(APPEND EXTRA_FLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
if(CMAKE_SYSTEM_NAME STREQUAL "iOS")
string(APPEND EXTRA_FLAGS " -mios-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
string(APPEND EXTRA_FLAGS " -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}")
endif()
endif()
endif()
if(CMAKE_CXX_COMPILER_TARGET)

2
ports/vcpkg-cmake/vcpkg.json
View File

@ -1,5 +1,5 @@
{
"name": "vcpkg-cmake",
"version-date": "2022-02-14",
"version-date": "2022-04-05",
"license": "MIT"
}

2
versions/baseline.json
View File

@ -7277,7 +7277,7 @@
"port-version": 1
},
"vcpkg-cmake": {
"baseline": "2022-02-14",
"baseline": "2022-04-05",
"port-version": 0
},
"vcpkg-cmake-config": {

5
versions/v-/vcpkg-cmake.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "34d8604d164edd2903bdb833adf30fe1516c9982",
"version-date": "2022-04-05",
"port-version": 0
},
{
"git-tree": "bdfdf28cf28bc07d02af864315ca291dcfae180b",
"version-date": "2022-02-14",