Skip to content

Commit

Permalink
[omplapp] Skip due to conflict with omplapp
Browse files Browse the repository at this point in the history
  • Loading branch information
WangWeiLin-MV committed Jul 30, 2024
1 parent 136a0d8 commit 31d34c3
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 21 deletions.
24 changes: 5 additions & 19 deletions ports/omplapp/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
vcpkg_buildpath_length_warning(37)

set(OMPL_VERSION 1.5.1)

vcpkg_download_distfile(ARCHIVE
URLS "https://github.com/ompl/omplapp/releases/download/1.5.1/omplapp-1.5.1-Source.tar.gz"
FILENAME "omplapp-${OMPL_VERSION}.tar.gz"
URLS "https://github.com/ompl/omplapp/releases/download/${VERSION}/omplapp-${VERSION}-Source.tar.gz"
FILENAME "omplapp-${VERSION}-Source.tar.gz"
SHA512 83b1b09d6be776f7e15a748402f0c2f072459921de61a92731daf5171bd1f91a829fbeb6e10a489b92fba0297f6272e7bb6b8f07830c387bb29ccdbc7b3731f3
)

Expand All @@ -15,7 +13,7 @@ endif()
vcpkg_extract_source_archive(
SOURCE_PATH
ARCHIVE ${ARCHIVE}
SOURCE_BASE ${OMPL_VERSION}
SOURCE_BASE ${VERSION}
PATCHES
fix_dependency.patch
${STATIC_PATCH}
Expand Down Expand Up @@ -58,18 +56,7 @@ 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)
file(REMOVE_RECURSE
"${CURRENT_PACKAGES_DIR}/include/ompl"
"${CURRENT_PACKAGES_DIR}/bin"
"${CURRENT_PACKAGES_DIR}/include/omplapp/CMakeFiles"
"${CURRENT_PACKAGES_DIR}/lib/ompl.lib"
"${CURRENT_PACKAGES_DIR}/share/ompl"
"${CURRENT_PACKAGES_DIR}/share/man"
"${CURRENT_PACKAGES_DIR}/debug/bin"
"${CURRENT_PACKAGES_DIR}/debug/include"
"${CURRENT_PACKAGES_DIR}/debug/lib/ompl.lib"
"${CURRENT_PACKAGES_DIR}/debug/share"
)
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/omplapp/config.h" "#define OMPLAPP_RESOURCE_DIR \"${CURRENT_PACKAGES_DIR}/share/ompl/resources\"" "")

Expand All @@ -79,5 +66,4 @@ endif()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/pkgconfig" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig")

# Handle copyright
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
2 changes: 1 addition & 1 deletion ports/omplapp/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "omplapp",
"version": "1.5.1",
"port-version": 5,
"port-version": 6,
"description": "Use OMPL for reading meshes and performing collision checking",
"homepage": "https://ompl.kavrakilab.org/",
"license": null,
Expand Down
2 changes: 2 additions & 0 deletions scripts/ci.baseline.txt
Original file line number Diff line number Diff line change
Expand Up @@ -831,6 +831,8 @@ ois:x64-android=fail
ompl:arm-neon-android=fail
ompl:arm64-android=fail
ompl:x64-android=fail
omplapp:arm64-osx = skip # conflicts with ompl
omplapp:x64-osx = skip
# opencc/deps/rapidjson-1.1.0/rapidjson.h: Unknown machine endianess detected
onednn:x64-android=fail
# opencc/deps/marisa-0.2.5/lib/marisa/grimoire/io/mapper.cc currently doesn't support UWP.
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6438,7 +6438,7 @@
},
"omplapp": {
"baseline": "1.5.1",
"port-version": 5
"port-version": 6
},
"onednn": {
"baseline": "3.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/omplapp.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "5e147eb1287efc91d8c405a942e0a37e066b9e96",
"version": "1.5.1",
"port-version": 6
},
{
"git-tree": "8c7e3d29552841ecf363e9f222c6bc554be4b91e",
"version": "1.5.1",
Expand Down

0 comments on commit 31d34c3

Please # to comment.