diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-10-07 19:35:13 +0200 |
|---|---|---|
| committer | Curtis J Bezault <curtbezault@gmail.com> | 2019-10-07 10:35:13 -0700 |
| commit | 726c11148105a97aef39bec024fdb7c140b1b154 (patch) | |
| tree | 26bd2aee0c13a8351b259cc4ffffaf0efededb4e /ports/cartographer | |
| parent | e86ff2cc54bda9e9ee322ab69141e7113d5c40a9 (diff) | |
| download | vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.tar.gz vcpkg-726c11148105a97aef39bec024fdb7c140b1b154.zip | |
[vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
Diffstat (limited to 'ports/cartographer')
| -rw-r--r-- | ports/cartographer/CONTROL | 2 | ||||
| -rw-r--r-- | ports/cartographer/disable-C2338-cartographer.patch | 13 | ||||
| -rw-r--r-- | ports/cartographer/portfile.cmake | 1 |
3 files changed, 1 insertions, 15 deletions
diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL index bf2916b69..10037dbad 100644 --- a/ports/cartographer/CONTROL +++ b/ports/cartographer/CONTROL @@ -1,5 +1,5 @@ Source: cartographer
-Version: 1.0.0-1
+Version: 1.0.0-2
Build-Depends: ceres[suitesparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf
Homepage: https://github.com/googlecartographer/cartographer
Description: Google 2D & 3D SLAM package
diff --git a/ports/cartographer/disable-C2338-cartographer.patch b/ports/cartographer/disable-C2338-cartographer.patch deleted file mode 100644 index 17452622d..000000000 --- a/ports/cartographer/disable-C2338-cartographer.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 95bb132..fbd624d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -237,7 +237,7 @@ if(${BUILD_PROMETHEUS})
- target_compile_definitions(${PROJECT_NAME} PUBLIC USE_PROMETHEUS=1)
- endif()
-
--set(TARGET_COMPILE_FLAGS "${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
-+set(TARGET_COMPILE_FLAGS "-D_DISABLE_EXTENDED_ALIGNED_STORAGE ${TARGET_COMPILE_FLAGS} ${GOOG_CXX_FLAGS}")
- set_target_properties(${PROJECT_NAME} PROPERTIES
- COMPILE_FLAGS ${TARGET_COMPILE_FLAGS})
-
diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake index f8b1ddcd8..b761c39bb 100644 --- a/ports/cartographer/portfile.cmake +++ b/ports/cartographer/portfile.cmake @@ -10,7 +10,6 @@ vcpkg_from_github( HEAD_REF master PATCHES fix-find-packages.patch - disable-C2338-cartographer.patch fix-build-error.patch ) |