-
Notifications
You must be signed in to change notification settings - Fork 6.7k
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.
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,omplapp] Overhaul #43987
Merged
Merged
[ompl,omplapp] Overhaul #43987
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
cbcac4e
[vcpkg baseline] Remove obsolete comment
dg0yt 68181f0
[ompl] Overhaul
dg0yt afef8ad
[omplapp] Update and overhaul
dg0yt 0c5cf42
Embrace ompl/omplapp integration
dg0yt bd6d6c3
Remove ompl and omplapp from baseline
dg0yt 457f580
[ompl] Less find modules
dg0yt 57a51bb
[omplapp] No find modules
dg0yt e2aa3fc
[omplapp] Fix linking of boost program options
dg0yt File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,20 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index a9bb05f..31fab8c 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -215,6 +215,10 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/omplConfig.cmake | ||
| ${CMAKE_CURRENT_BINARY_DIR}/omplConfigVersion.cmake | ||
| DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ompl/cmake | ||
| COMPONENT ompl) | ||
| +install(EXPORT ompl | ||
| + DESTINATION "share/ompl" | ||
| + FILE ompl-targets.cmake | ||
| +) | ||
|
|
||
| # script to install ompl on Ubuntu | ||
| configure_file("${CMAKE_CURRENT_SOURCE_DIR}/install-ompl-ubuntu.sh.in" | ||
| diff --git a/src/ompl/CMakeLists.txt b/src/ompl/CMakeLists.txt | ||
| index 9ea130e..6dda4df 100644 | ||
| index 8e19b30..df38912 100644 | ||
| --- a/src/ompl/CMakeLists.txt | ||
| +++ b/src/ompl/CMakeLists.txt | ||
| @@ -83,6 +83,7 @@ endif (MSVC) | ||
| @@ -84,9 +84,15 @@ else (MSVC) | ||
| endif (MSVC) | ||
|
|
||
| # install the library | ||
| +target_include_directories(ompl PUBLIC $<INSTALL_INTERFACE:include>) | ||
| install(TARGETS ompl | ||
| + EXPORT ompl | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| COMPONENT ompl) | ||
| +install(EXPORT ompl | ||
| + DESTINATION "share/ompl" | ||
| + FILE ompl-targets.cmake | ||
| +) | ||
| if (NOT MSVC) | ||
| add_custom_command(TARGET ompl POST_BUILD | ||
| COMMAND "${CMAKE_COMMAND}" -E copy "$<TARGET_FILE:ompl>" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index cc81419..88046b3 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -183,7 +183,7 @@ add_subdirectory(demos) | ||
| add_subdirectory(scripts) | ||
| add_subdirectory(doc) | ||
|
|
||
| -if(NOT MSVC) | ||
| +if(0) | ||
| target_link_flags(ompl) | ||
| set(PKG_NAME "ompl") | ||
| set(PKG_DESC "The Open Motion Planning Library") |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| function(find_python_module) | ||
| endfunction() | ||
| macro(find_boost_python) | ||
| endmacro() | ||
| macro(install_python) | ||
| endmacro() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 34bf0b4..b49b47f 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -38,7 +38,6 @@ set(OMPL_CMAKE_UTIL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/ompl/CMakeModules" | ||
|
|
||
| if(MSVC) | ||
| add_definitions(-DBOOST_ALL_NO_LIB) | ||
| - add_definitions(-DBOOST_PROGRAM_OPTIONS_DYN_LINK) | ||
| endif(MSVC) | ||
| # Ensure dynamic linking with boost unit_test_framework | ||
| add_definitions(-DBOOST_TEST_DYN_LINK) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| diff --git a/src/omplapp/CMakeLists.txt b/src/omplapp/CMakeLists.txt | ||
| index 2d0c8e5..9cd902f 100644 | ||
| --- a/src/omplapp/CMakeLists.txt | ||
| +++ b/src/omplapp/CMakeLists.txt | ||
| @@ -39,6 +39,7 @@ foreach(_target ${OMPLAPP_TARGETS}) | ||
| endif(WIN32) | ||
|
|
||
| install(TARGETS ${_target} | ||
| + EXPORT omplapp | ||
| DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| COMPONENT omplapp) | ||
| if(NOT MSVC) | ||
| @@ -54,3 +55,8 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in" | ||
| install(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" | ||
| DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/omplapp" | ||
| COMPONENT omplapp) | ||
| + | ||
| +install(EXPORT omplapp | ||
| + FILE omplapp-targets.cmake | ||
| + DESTINATION "share/ompl" | ||
| +) |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could it be changed to
CMAKE_DISABLE_FIND_PACKAGE_?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No.
omplandomplapprely on extra functions and macros being added by its ownFindPython.cmake. This is solved by the noop module vendored into the port.