diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-03-26 11:58:37 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-03-26 11:59:06 -0700 |
| commit | 64ab9dc274c352f9999f2cc4e8f7f6830cc56c42 (patch) | |
| tree | 362413dbfdab9b8b6fcf0d6db2c38d41247d9e41 | |
| parent | 6dc98bbcee6a00269dd93d61950d8ab4c55c3d0b (diff) | |
| download | vcpkg-64ab9dc274c352f9999f2cc4e8f7f6830cc56c42.tar.gz vcpkg-64ab9dc274c352f9999f2cc4e8f7f6830cc56c42.zip | |
[ceres] Use gflags config file + ninja. Fixes #3116.
| -rw-r--r-- | ports/ceres/CONTROL | 2 | ||||
| -rw-r--r-- | ports/ceres/portfile.cmake | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/ports/ceres/CONTROL b/ports/ceres/CONTROL index 3f60a3312..208082de7 100644 --- a/ports/ceres/CONTROL +++ b/ports/ceres/CONTROL @@ -1,5 +1,5 @@ Source: ceres -Version: 1.14.0 +Version: 1.14.0-1 # eigen is always required by CMake, even if it isn't used. Build-Depends: glog, eigen3 Description: non-linear optimization package diff --git a/ports/ceres/portfile.cmake b/ports/ceres/portfile.cmake index b6dfacf9f..7267be402 100644 --- a/ports/ceres/portfile.cmake +++ b/ports/ceres/portfile.cmake @@ -46,6 +46,7 @@ endif() vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS -DEXPORT_BUILD_DIR=ON -DBUILD_EXAMPLES=OFF @@ -55,7 +56,7 @@ vcpkg_configure_cmake( -DEIGENSPARSE=${EIGENSPARSE} -DLAPACK=${LAPACK} -DSUITESPARSE=${SUITESPARSE} - -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this + -DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=ON -DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF # TheiaSfm doesn't work well with this -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT_VALUE} ) |