[omplapp] fix build (#28506)

microsoft · Dec 28, 2022 · 23c3f58 · 23c3f58
1 parent 4226c83
commit 23c3f58
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 14 deletions.
diff --git a/ports/omplapp/portfile.cmake b/ports/omplapp/portfile.cmake
@@ -12,10 +12,10 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
     set(STATIC_PATCH fix_boost_static_link.patch)
 endif()
 
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
+vcpkg_extract_source_archive(
+    SOURCE_PATH
     ARCHIVE ${ARCHIVE}
-    REF ${OMPL_VERSION}
+    SOURCE_BASE ${OMPL_VERSION}
     PATCHES
         fix_dependency.patch
         ${STATIC_PATCH}
@@ -77,13 +77,5 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 
-if(NOT VCPKG_TARGET_IS_WINDOWS)
-    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp")
-    if(NOT VCPKG_BUILD_TYPE)
-        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/ompl.pc" "assimp::assimp" "assimp")
-    endif()
-    vcpkg_fixup_pkgconfig()
-endif()
-
 # Handle copyright
 file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/omplapp/vcpkg.json b/ports/omplapp/vcpkg.json
@@ -1,19 +1,32 @@
 {
   "name": "omplapp",
   "version": "1.5.1",
-  "port-version": 3,
+  "port-version": 4,
   "description": "Use OMPL for reading meshes and performing collision checking",
   "homepage": "https://ompl.kavrakilab.org/",
+  "license": null,
   "dependencies": [
     "assimp",
+    "boost-dynamic-bitset",
     "boost-filesystem",
+    "boost-graph",
+    "boost-odeint",
     "boost-program-options",
     "boost-serialization",
     "boost-system",
+    "boost-test",
+    "boost-timer",
+    "boost-ublas",
     "ccd",
     "eigen3",
     "fcl",
-    "ompl",
+    {
+      "name": "omplapp",
+      "features": [
+        "threads"
+      ],
+      "platform": "linux"
+    },
     {
       "name": "vcpkg-cmake",
       "host": true

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -5426,7 +5426,7 @@
     },
     "omplapp": {
       "baseline": "1.5.1",
-      "port-version": 3
+      "port-version": 4
     },
     "onednn": {
       "baseline": "2.6.1",

diff --git a/versions/o-/omplapp.json b/versions/o-/omplapp.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f3fba6a92711a359d5418b5568c973b69ff7fdda",
+      "version": "1.5.1",
+      "port-version": 4
+    },
     {
       "git-tree": "3f243c859f1597f18da61a472684c113e2ed150d",
       "version": "1.5.1",