aboutsummaryrefslogtreecommitdiff
path: root/ports/cartographer
diff options
context:
space:
mode:
authorWimok Nupphiboon <wimok.mok@gmail.com>2018-04-22 20:35:52 +0700
committerWimok Nupphiboon <wimok.mok@gmail.com>2018-04-22 20:35:52 +0700
commitbefd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42 (patch)
treefd4cfee016003e6be2898ac5d37f679a567cad76 /ports/cartographer
parent4c028691c7f03335f6fb8a38ce80794c213819cb (diff)
parent4f52f53b99f6a5465157958bc99f79cc0b2712ad (diff)
downloadvcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.tar.gz
vcpkg-befd3c6be2db90e5bc3a7acb2b0103cb6dfd7b42.zip
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'ports/cartographer')
-rw-r--r--ports/cartographer/CONTROL2
-rw-r--r--ports/cartographer/portfile.cmake5
2 files changed, 4 insertions, 3 deletions
diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL
index 8439ea8e6..88f0dc6b7 100644
--- a/ports/cartographer/CONTROL
+++ b/ports/cartographer/CONTROL
@@ -1,4 +1,4 @@
Source: cartographer
-Version: 0.3.0-3
+Version: 0.3.0-4
Build-Depends: ceres[eigensparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
Description: Google 2D & 3D SLAM package
diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake
index 49ca1b4b2..75f28a015 100644
--- a/ports/cartographer/portfile.cmake
+++ b/ports/cartographer/portfile.cmake
@@ -16,7 +16,8 @@ vcpkg_apply_patches(
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS
+ PREFER_NINJA
+ OPTIONS
-DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF
-DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF
-Dgtest_disable_pthreads=ON
@@ -27,7 +28,7 @@ vcpkg_configure_cmake(
)
vcpkg_install_cmake()
-
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/cartographer)
vcpkg_copy_pdbs()
# Clean