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

Jump to bottom

[ompl] Fix ompl[app] build error #10854

Merged
merged 4 commits into from
Apr 21, 2020
Merged

[ompl] Fix ompl[app] build error #10854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ffa169c
[ompl] Fix ompl[app] build error
LilyWangL Apr 16, 2020
b8fc701
[ompl] Fix patch apply error
LilyWangL Apr 17, 2020
91a4dba
[ompl] Remove extra comment
LilyWangL Apr 17, 2020
d19cbb4
[ompl] Fix build error on Linux/MACOS
LilyWangL Apr 20, 2020
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
3 changes: 2 additions & 1 deletion ports/ompl/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: ompl
Version: 1.4.2-2
Version: 1.4.2-3
Homepage: https://bitbucket.org/ompl
Description: The Open Motion Planning Library, consists of many state-of-the-art sampling-based motion planning algorithms
Build-Depends: boost-disjoint-sets, boost-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3

Expand Down
13 changes: 13 additions & 0 deletions ports/ompl/fix-findeigen3.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbde81b..c31c6ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -110,7 +110,7 @@ endif()
set_package_properties(Eigen3 PROPERTIES
URL "http://eigen.tuxfamily.org"
PURPOSE "A linear algebra library used throughout OMPL.")
-find_package(Eigen3 REQUIRED)
+find_package(Eigen3 CONFIG REQUIRED)
include_directories("${EIGEN3_INCLUDE_DIR}")

set_package_properties(MORSE PROPERTIES
12 changes: 6 additions & 6 deletions ports/ompl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
include(vcpkg_common_functions)

vcpkg_buildpath_length_warning(37)

set(OMPL_VERSION 1.4.2)
Expand All @@ -21,6 +19,7 @@ vcpkg_extract_source_archive_ex(
OUT_SOURCE_PATH SOURCE_PATH
ARCHIVE ${ARCHIVE}
REF ${OMPL_VERSION}
PATCHES fix-findeigen3.patch
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
Expand Down Expand Up @@ -58,8 +57,9 @@ if ("app" IN_LIST FEATURES)
)
endif()

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/ompl RENAME copyright)
if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
endif()

# Post-build test for cmake libraries
# vcpkg_test_cmake(PACKAGE_NAME ompl)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
2 changes: 0 additions & 2 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,8 +1235,6 @@ ogre-next:x86-windows = skip
ois:arm64-windows=fail
ois:arm-uwp=fail
ois:x64-uwp=fail
ompl:x64-osx=fail
ompl:x64-linux=ignore
open62541:arm-uwp=fail
open62541:x64-uwp=fail
openal-soft:arm-uwp=fail
Expand Down