diff options
| author | Larry-Hu <v-daih@microsoft.com> | 2018-06-12 01:34:07 -0700 |
|---|---|---|
| committer | Larry-Hu <v-daih@microsoft.com> | 2018-06-12 01:34:07 -0700 |
| commit | 9d0c7ca02e9eb72e3de06fe4b615e210874e4b11 (patch) | |
| tree | f5fe6499627615d96299aeb7b2e191538290a82f /ports/cartographer | |
| parent | 80f64c24dc0513b053f431059bc50634321702e7 (diff) | |
| download | vcpkg-9d0c7ca02e9eb72e3de06fe4b615e210874e4b11.tar.gz vcpkg-9d0c7ca02e9eb72e3de06fe4b615e210874e4b11.zip | |
Add Compiler option -D_DISABLE_EXTENDED_ALIGNED to disable error C2338
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 | 7 |
3 files changed, 16 insertions, 6 deletions
diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL index 88f0dc6b7..73fcc6541 100644 --- a/ports/cartographer/CONTROL +++ b/ports/cartographer/CONTROL @@ -1,4 +1,4 @@ Source: cartographer -Version: 0.3.0-4 +Version: 0.3.0-5 Build-Depends: ceres[eigensparse], gflags, glog, lua, cairo, boost-iostreams, gtest, protobuf Description: Google 2D & 3D SLAM package diff --git a/ports/cartographer/disable-C2338-cartographer.patch b/ports/cartographer/disable-C2338-cartographer.patch new file mode 100644 index 000000000..d43367218 --- /dev/null +++ b/ports/cartographer/disable-C2338-cartographer.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bc92e9b..4c1826a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -226,7 +226,7 @@ target_include_directories(${PROJECT_NAME} SYSTEM PRIVATE
+ "${GMOCK_INCLUDE_DIRS}")
+ target_link_libraries(${PROJECT_NAME} PUBLIC ${GMOCK_LIBRARY})
+
+-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 75f28a015..45a3c1b99 100644 --- a/ports/cartographer/portfile.cmake +++ b/ports/cartographer/portfile.cmake @@ -6,12 +6,9 @@ vcpkg_from_github( REF a7ed7e224f98b396762c865b81b62dc3abea2e81 SHA512 2ab167c1c314591b4916baf70b8ad92ae542986c3578319d2454c904adae10f8027bc696579d6e2864d3606a6711563b82438e847527cad4ab0c2bd603a63eb7 HEAD_REF master -) - -vcpkg_apply_patches( - SOURCE_PATH ${SOURCE_PATH} - PATCHES + PATCHES ${CMAKE_CURRENT_LIST_DIR}/fix-find-packages.patch + ${CMAKE_CURRENT_LIST_DIR}/disable-C2338-cartographer.patch ) vcpkg_configure_cmake( |