From e9ff3cd5a04cd0e8122ff56e9873985ff71aa3ca Mon Sep 17 00:00:00 2001 From: Sean Yen Date: Fri, 30 Oct 2020 17:29:34 -0700 Subject: fix CMake files. (#14306) --- ports/cartographer/CONTROL | 2 +- ports/cartographer/fix-cmake-location.patch | 22 ++++++++++++++++++++++ ports/cartographer/portfile.cmake | 1 + 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ports/cartographer/fix-cmake-location.patch diff --git a/ports/cartographer/CONTROL b/ports/cartographer/CONTROL index 10037dbad..50d324a94 100644 --- a/ports/cartographer/CONTROL +++ b/ports/cartographer/CONTROL @@ -1,5 +1,5 @@ Source: cartographer -Version: 1.0.0-2 +Version: 1.0.0-3 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/fix-cmake-location.patch b/ports/cartographer/fix-cmake-location.patch new file mode 100644 index 000000000..b0eb12397 --- /dev/null +++ b/ports/cartographer/fix-cmake-location.patch @@ -0,0 +1,22 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2e3a686be..f2a0c5d8e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -300,7 +300,7 @@ foreach(HDR ${INSTALL_GENERATED_HDRS}) + ) + endforeach() + +-set(CARTOGRAPHER_CMAKE_DIR share/cartographer/cmake) ++set(CARTOGRAPHER_CMAKE_DIR share/cartographer) + include(CMakePackageConfigHelpers) + configure_package_config_file( + cartographer-config.cmake.in +@@ -311,7 +311,7 @@ configure_package_config_file( + + install( + EXPORT CartographerExport +- DESTINATION share/cartographer/cmake/ ++ DESTINATION share/cartographer/ + FILE CartographerTargets.cmake + ) + diff --git a/ports/cartographer/portfile.cmake b/ports/cartographer/portfile.cmake index 91f6197ec..13e4a7641 100644 --- a/ports/cartographer/portfile.cmake +++ b/ports/cartographer/portfile.cmake @@ -9,6 +9,7 @@ vcpkg_from_github( PATCHES fix-find-packages.patch fix-build-error.patch + fix-cmake-location.patch ) vcpkg_configure_cmake( -- cgit v1.2.3