[ceres] Use ceres without gflags for [arm-uwp] build (#26434)

* Use Cmake without gflash for UWP-ARM64 build

* Merge branch 'master' of https://github.com/Microsoft/vcpkg

* Update version database

* Added glog dependencie for not uwp platforms

* Formatted vcpkg.json

* Updated version

* Added MINIGLOG Feature in uwp

* Update version database

* Changed platform support for glog

* Update version database

Co-authored-by: Adolfo Solis <asolis@polyworksmexico.com>
This commit is contained in:
Adolfo Solis 2022-08-24 10:59:33 -05:00 committed by GitHub
parent 6511a6f0d5
commit 9eb19776b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 3 deletions

View File

@ -35,6 +35,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"tools" GFLAGS "tools" GFLAGS
"cuda" CUDA "cuda" CUDA
) )
if(VCPKG_TARGET_IS_UWP)
list(APPEND FEATURE_OPTIONS -DMINIGLOG=ON)
endif()
foreach (FEATURE ${FEATURE_OPTIONS})
message(STATUS "${FEATURE}")
endforeach()
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}" SOURCE_PATH "${SOURCE_PATH}"

View File

@ -1,13 +1,16 @@
{ {
"name": "ceres", "name": "ceres",
"version": "2.1.0", "version": "2.1.0",
"port-version": 1, "port-version": 2,
"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",
"dependencies": [ "dependencies": [
"eigen3", "eigen3",
"glog", {
"name": "glog",
"platform": "!(arm & uwp)"
},
{ {
"name": "vcpkg-cmake", "name": "vcpkg-cmake",
"host": true "host": true

View File

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

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "4baf16216d2d50574964ba5795a501bb89193042",
"version": "2.1.0",
"port-version": 2
},
{ {
"git-tree": "85a5ff9f8727124ce91655f2d37b9a6c77f367e1", "git-tree": "85a5ff9f8727124ce91655f2d37b9a6c77f367e1",
"version": "2.1.0", "version": "2.1.0",