Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ompl] Fix config for find_package #21864

Merged
merged 3 commits into from
Dec 7, 2021
Merged

[ompl] Fix config for find_package #21864

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9235e35
Fix ompl config
Ace314159 Dec 5, 2021
fdb5897
Update ports/ompl/vcpkg.json
Ace314159 Dec 6, 2021
9c021b1
Update versions
Ace314159 Dec 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions ports/ompl/0002_Fix_config.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
diff --git a/omplConfig.cmake.in b/omplConfig.cmake.in
index 465de25..ad373fa 100644
index 465de25d..d1e91929 100644
--- a/omplConfig.cmake.in
+++ b/omplConfig.cmake.in
@@ -18,8 +18,10 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@)
@@ -18,8 +18,11 @@ set(OMPL_MAJOR_VERSION @PROJECT_VERSION_MAJOR@)
set(OMPL_MINOR_VERSION @PROJECT_VERSION_MINOR@)
set(OMPL_PATCH_VERSION @PROJECT_VERSION_PATCH@)

+include(CMakeFindDependencyMacro)
+find_dependency(Boost 1.58 COMPONENTS serialization filesystem system program_options)
+find_dependency(Eigen3)
set_and_check(OMPL_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
Expand All @@ -14,7 +15,7 @@ index 465de25..ad373fa 100644
foreach(_dir @FLANN_INCLUDE_DIRS@;@ODE_INCLUDE_DIRS@;@SPOT_INCLUDE_DIRS@;@TRIANGLE_INCLUDE_DIR@;@FCL_INCLUDE_DIRS@;@PQP_INCLUDE_DIR@;@ASSIMP_INCLUDE_DIRS@;@OPENGL_INCLUDE_DIR@)
if(_dir)
list(APPEND OMPL_INCLUDE_DIRS "${_dir}")
@@ -29,7 +31,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS)
@@ -29,7 +32,7 @@ list(REMOVE_DUPLICATES OMPL_INCLUDE_DIRS)
set(OMPL_INCLUDE_DIRS "${OMPL_INCLUDE_DIRS}" CACHE STRING "Include path for OMPL and its dependencies")

set_and_check(OMPL_LIBRARY_DIR @PACKAGE_LIB_INSTALL_DIR@)
Expand All @@ -23,7 +24,7 @@ index 465de25..ad373fa 100644
foreach(_dir @FLANN_LIBRARY_DIRS@;@ODE_LIBRARY_DIRS@;@SPOT_LIBRARY_DIRS@;@FCL_LIBRARY_DIRS@;@ASSIMP_LIBRARY_DIRS@)
if(_dir)
list(APPEND OMPL_LIBRARY_DIRS "${_dir}")
@@ -40,7 +42,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL
@@ -40,7 +43,7 @@ set(OMPL_LIBRARY_DIRS "${OMPL_LIBRARY_DIRS}" CACHE STRING "Library path for OMPL

find_library(OMPL_LIBRARIES NAMES ompl.${OMPL_VERSION} ompl
PATHS ${OMPL_LIBRARY_DIR} NO_DEFAULT_PATH)
Expand All @@ -32,7 +33,7 @@ index 465de25..ad373fa 100644
if(_lib)
list(APPEND OMPL_LIBRARIES "${_lib}")
endif()
@@ -61,3 +63,4 @@ endif()
@@ -61,3 +64,4 @@ endif()

include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ompl DEFAULT_MSG OMPL_INCLUDE_DIRS OMPL_LIBRARY_DIRS OMPL_LIBRARIES)
Expand Down
4 changes: 2 additions & 2 deletions ports/ompl/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ompl",
"version-string": "1.5.1",
"port-version": 3,
"version": "1.5.1",
"port-version": 4,
"description": "The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms",
"homepage": "https://ompl.kavrakilab.org/",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4862,7 +4862,7 @@
},
"ompl": {
"baseline": "1.5.1",
"port-version": 3
"port-version": 4
},
"omplapp": {
"baseline": "1.5.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/ompl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "55fdebdea02caaa9252c3e036fb360fa0cd5f79b",
"version-string": "1.5.1",
"port-version": 4
},
{
"git-tree": "4385de7645c202d99bb25420d049f15cb54d9ed7",
"version-string": "1.5.1",
Expand Down