[ceres] Fix missing iOS deployment target (#29432)

This commit is contained in:
Aleksi Sapon 2023-02-03 21:36:30 -05:00 committed by GitHub
parent e1ba85acf9
commit f648140dbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 2 deletions

View File

@ -43,10 +43,17 @@ foreach (FEATURE ${FEATURE_OPTIONS})
message(STATUS "${FEATURE}") message(STATUS "${FEATURE}")
endforeach() endforeach()
set(TARGET_OPTIONS )
if(VCPKG_TARGET_IS_IOS)
# Note: CMake uses "OSX" not just for macOS, but also iOS, watchOS and tvOS.
list(APPEND TARGET_OPTIONS "-DIOS_DEPLOYMENT_TARGET=${VCPKG_OSX_DEPLOYMENT_TARGET}")
endif()
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"
OPTIONS OPTIONS
${FEATURE_OPTIONS} ${FEATURE_OPTIONS}
${TARGET_OPTIONS}
-DEXPORT_BUILD_DIR=ON -DEXPORT_BUILD_DIR=ON
-DBUILD_BENCHMARKS=OFF -DBUILD_BENCHMARKS=OFF
-DBUILD_EXAMPLES=OFF -DBUILD_EXAMPLES=OFF

View File

@ -1,7 +1,7 @@
{ {
"name": "ceres", "name": "ceres",
"version": "2.1.0", "version": "2.1.0",
"port-version": 2, "port-version": 3,
"description": "non-linear optimization package", "description": "non-linear optimization package",
"homepage": "https://github.com/ceres-solver/ceres-solver", "homepage": "https://github.com/ceres-solver/ceres-solver",
"license": "Apache-2.0", "license": "Apache-2.0",

View File

@ -1382,7 +1382,7 @@
}, },
"ceres": { "ceres": {
"baseline": "2.1.0", "baseline": "2.1.0",
"port-version": 2 "port-version": 3
}, },
"cfitsio": { "cfitsio": {
"baseline": "3.49", "baseline": "3.49",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "41580e5d78c0894588ee748ef09366ff9309aa0c",
"version": "2.1.0",
"port-version": 3
},
{ {
"git-tree": "4baf16216d2d50574964ba5795a501bb89193042", "git-tree": "4baf16216d2d50574964ba5795a501bb89193042",
"version": "2.1.0", "version": "2.1.0",