mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-28 04:19:00 +08:00
[ompl] Fix patch apply error (#10972)
* [ompl] Fix patch apply error * [ompl] Fix build error * [ompl] Add comments
This commit is contained in:
parent
24e8be5fcf
commit
e57b024ccb
@ -1,5 +1,5 @@
|
||||
Source: ompl
|
||||
Version: 1.4.2-3
|
||||
Version: 1.4.2-4
|
||||
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-dynamic-bitset, boost-filesystem, boost-graph, boost-odeint, boost-program-options, boost-serialization, boost-system, boost-test, boost-ublas, boost-timer, eigen3
|
||||
|
@ -1,13 +0,0 @@
|
||||
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
|
@ -19,8 +19,13 @@ vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
REF ${OMPL_VERSION}
|
||||
PATCHES fix-findeigen3.patch
|
||||
)
|
||||
|
||||
#Due to there are URL before the change text, using patch modify this change failed, so use the following command instead of patch.
|
||||
file(READ ${SOURCE_PATH}/CMakeLists.txt _contents)
|
||||
string(REPLACE "find_package(Eigen3 REQUIRED)" "find_package(Eigen3 CONFIG REQUIRED)" _contents "${_contents}")
|
||||
file(WRITE ${SOURCE_PATH}/CMakeLists.txt "${_contents}")
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
|
Loading…
Reference in New Issue
Block a user