mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 04:09:00 +08:00
[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
This commit is contained in:
parent
7873205e98
commit
43d13abe44
@ -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
|
||||
|
||||
|
13
ports/ompl/fix-findeigen3.patch
Normal file
13
ports/ompl/fix-findeigen3.patch
Normal file
@ -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
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user