[cartographer] no absolute paths (#21709)

This commit is contained in:
autoantwort 2021-11-30 01:52:34 +01:00 committed by GitHub
parent 84216277df
commit f9acdf90c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 12 deletions

View File

@ -12,9 +12,8 @@ vcpkg_from_github(
fix-cmake-location.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DGFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION=OFF
-DGLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION=OFF
@ -24,14 +23,14 @@ vcpkg_configure_cmake(
-DFORCE_DEBUG_BUILD=True
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()
vcpkg_cmake_install()
vcpkg_cmake_config_fixup()
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/cartographer/CartographerTargets.cmake" "${SOURCE_PATH}/;" "")
vcpkg_copy_pdbs()
# Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
# Handle copyright of cartographer
file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cartographer)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/cartographer/LICENSE ${CURRENT_PACKAGES_DIR}/share/cartographer/copyright)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

View File

@ -1,7 +1,7 @@
{
"name": "cartographer",
"version": "1.0.0",
"port-version": 4,
"port-version": 5,
"description": "Google 2D & 3D SLAM package",
"homepage": "https://github.com/googlecartographer/cartographer",
"dependencies": [
@ -17,6 +17,14 @@
"glog",
"gtest",
"lua",
"protobuf"
"protobuf",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -1238,7 +1238,7 @@
},
"cartographer": {
"baseline": "1.0.0",
"port-version": 4
"port-version": 5
},
"casclib": {
"baseline": "2021-11-16",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b0e352bf9c678b6425f767a21470b2c8ef3f79b9",
"version": "1.0.0",
"port-version": 5
},
{
"git-tree": "ec66f22ef7f9e652008269b8419a34350d97accf",
"version": "1.0.0",