mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 06:29:08 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[ompl] Fix config for find_package (#21864)

Browse Source 
* Fix ompl config

* Update ports/ompl/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update versions

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
This commit is contained in:
Akash 2021-12-06 21:51:42 -08:00 committed by GitHub
parent df8276a218
commit 80be868eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ports/ompl/0002_Fix_config.patch
View File

@ -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@")
@ -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@)
@ -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)
@ -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)

4
ports/ompl/vcpkg.json
View File

@ -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": [

2
versions/baseline.json
View File

@ -4866,7 +4866,7 @@
},
"ompl": {
"baseline": "1.5.1",
"port-version": 3
"port-version": 4
},
"omplapp": {
"baseline": "1.5.1",

5
versions/o-/ompl.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "cde8f8a96e5fc3c5764ca85632efa1b828868e26",
"version": "1.5.1",
"port-version": 4
},
{
"git-tree": "4385de7645c202d99bb25420d049f15cb54d9ed7",
"version-string": "1.5.1",