[omplapp] no absolute paths (#21721)

This commit is contained in:
autoantwort 2021-11-30 02:01:33 +01:00 committed by GitHub
parent b6208108a7
commit 8500aee297
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 12 deletions

View File

@ -22,14 +22,11 @@ vcpkg_extract_source_archive_ex(
)
# Based on selected features different files get downloaded, so use the following command instead of patch.
file(READ ${SOURCE_PATH}/CMakeLists.txt _contents)
string(REPLACE "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)" _contents "${_contents}")
string(REPLACE "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)" _contents "${_contents}")
file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${_contents}")
vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 REQUIRED CONFIG)")
vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "find_package(ccd REQUIRED)" "find_package(ccd REQUIRED CONFIG)")
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
DISABLE_PARALLEL_CONFIGURE
OPTIONS
-DOMPL_VERSIONED_INSTALL=OFF
@ -40,9 +37,9 @@ vcpkg_configure_cmake(
-DOMPL_BUILD_PYTESTS=OFF
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_fixup_cmake_targets(CONFIG_PATH share/ompl/cmake)
vcpkg_cmake_config_fixup(CONFIG_PATH share/ompl/cmake)
# Remove debug distribution and other, move ompl_benchmark to tools/ dir
vcpkg_copy_tools(TOOL_NAMES ompl_benchmark AUTO_CLEAN)
@ -59,6 +56,8 @@ file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/debug/share"
)
vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/omplapp/config.h" "#define OMPLAPP_RESOURCE_DIR \"${CURRENT_PACKAGES_DIR}/share/ompl/resources\"" "")
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

View File

@ -1,11 +1,20 @@
{
"name": "omplapp",
"version-string": "1.5.1",
"version": "1.5.1",
"port-version": 1,
"description": "Use OMPL for reading meshes and performing collision checking",
"homepage": "https://ompl.kavrakilab.org/",
"dependencies": [
"assimp",
"fcl",
"ompl"
"ompl",
{
"name": "vcpkg-cmake",
"host": true
},
{
"name": "vcpkg-cmake-config",
"host": true
}
]
}

View File

@ -4862,7 +4862,7 @@
},
"omplapp": {
"baseline": "1.5.1",
"port-version": 0
"port-version": 1
},
"onednn": {
"baseline": "2.4.3",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "8860b6976a0c226039034eb0b59146708d27a635",
"version": "1.5.1",
"port-version": 1
},
{
"git-tree": "590eb9956381e7ef47b780fbd9aee2c6e8da323c",
"version-string": "1.5.1",