diff options
| author | Lily <47812810+LilyWangL@users.noreply.github.com> | 2020-04-22 04:31:10 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-21 13:31:10 -0700 |
| commit | 43d13abe44bf0c4fab67be53843706637337ed4e (patch) | |
| tree | e575d3c8215fc77caa6cdcbfd6f954b5a5d59a74 | |
| parent | 7873205e98686811b2ad3a67ed914f9d6f2f5611 (diff) | |
| download | vcpkg-43d13abe44bf0c4fab67be53843706637337ed4e.tar.gz vcpkg-43d13abe44bf0c4fab67be53843706637337ed4e.zip | |
[ompl] Fix ompl[app] build error (#10854)
* [ompl] Fix ompl[app] build error
* [ompl] Fix patch apply error
* [ompl] Remove extra comment
* [ompl] Fix build error on Linux/MACOS
| -rw-r--r-- | ports/ompl/CONTROL | 3 | ||||
| -rw-r--r-- | ports/ompl/fix-findeigen3.patch | 13 | ||||
| -rw-r--r-- | ports/ompl/portfile.cmake | 12 | ||||
| -rw-r--r-- | scripts/ci.baseline.txt | 2 |
4 files changed, 21 insertions, 9 deletions
diff --git a/ports/ompl/CONTROL b/ports/ompl/CONTROL index 221507c05..e926b82eb 100644 --- a/ports/ompl/CONTROL +++ b/ports/ompl/CONTROL @@ -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
diff --git a/ports/ompl/fix-findeigen3.patch b/ports/ompl/fix-findeigen3.patch new file mode 100644 index 000000000..137aacf20 --- /dev/null +++ b/ports/ompl/fix-findeigen3.patch @@ -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 diff --git a/ports/ompl/portfile.cmake b/ports/ompl/portfile.cmake index f6eaab808..986afe2b6 100644 --- a/ports/ompl/portfile.cmake +++ b/ports/ompl/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions)
-
vcpkg_buildpath_length_warning(37)
set(OMPL_VERSION 1.4.2)
@@ -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}
@@ -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)
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index d44aa4410..386bf5829 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -1233,8 +1233,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
|