diff options
| author | Akash <Ace314159@users.noreply.github.com> | 2021-07-22 17:00:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-22 15:00:49 -0700 |
| commit | d12cbb40ed3eb0eb60b844585f57a5d0b6ed0c23 (patch) | |
| tree | 47742301a5fbd2501a0a657105dd0cbb35184a72 /ports/ompl/fix_dependency.patch | |
| parent | 2a0c48a32dc82fe4416605fae8ac897bc2dab4da (diff) | |
| download | vcpkg-d12cbb40ed3eb0eb60b844585f57a5d0b6ed0c23.tar.gz vcpkg-d12cbb40ed3eb0eb60b844585f57a5d0b6ed0c23.zip | |
[ompl] Fix linking using ${OMPL_LIBRARIES} (#18908)
* Fix _IMPORT_PREFIX
* Export cmake targets file
* Fix config
* Make separate omplapp port
* Run x-add-version for omplapp
* Fix versions
* Fix omplapp static builds
* Run x-add-version
* Update ports/omplapp/portfile.cmake
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Update ports/omplapp/portfile.cmake
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Put files in quotes
* Run x-add-version
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'ports/ompl/fix_dependency.patch')
| -rw-r--r-- | ports/ompl/fix_dependency.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/ports/ompl/fix_dependency.patch b/ports/ompl/fix_dependency.patch deleted file mode 100644 index 4a19f81b8..000000000 --- a/ports/ompl/fix_dependency.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4c7e6901..a433b7da 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -136,7 +136,7 @@ find_package(Drawstuff QUIET)
- set_package_properties(assimp PROPERTIES
- URL "http://assimp.org"
- PURPOSE "Used in ompl_app for reading meshes representing robots and environments.")
--find_package(assimp REQUIRED)
-+find_package(assimp CONFIG REQUIRED)
- set_package_properties(ccd PROPERTIES
- URL "https://github.com/danfis/libccd"
- PURPOSE "Collision detection library used by fcl.")
-@@ -178,8 +178,7 @@ include_directories(
- "${OMPLAPP_INCLUDE_DIRS}"
- "${OMPL_INCLUDE_DIRS}"
- "${EIGEN3_INCLUDE_DIR}"
-- "${FCL_INCLUDE_DIRS}"
-- "${ASSIMP_INCLUDE_DIRS}")
-+ "${FCL_INCLUDE_DIRS}")
-
- # ROS installs fcl in /usr. In /usr/include/fcl/config.h it says octomap was
- # enabled. Octomap is installed in /opt/ros/${ROS_DISTRO}/include (most
-@@ -195,7 +194,7 @@ set(OMPLAPP_MODULE_LIBRARIES
- ${FCL_LIBRARIES})
- set(OMPLAPP_LIBRARIES
- ${OPENGL_LIBRARIES}
-- ${ASSIMP_LIBRARIES}
-+ assimp::assimp
- ${FCL_LIBRARIES})
- link_directories(${ASSIMP_LIBRARY_DIRS} ${CCD_LIBRARY_DIRS} ${OCTOMAP_LIBRARY_DIRS} ${FCL_LIBRARY_DIRS})
-
|