diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-03-11 07:52:55 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-10 16:52:55 -0700 |
| commit | 39079db85f3b4b9cf2a82a1e5cef830e5fd466b3 (patch) | |
| tree | c8a815ecbdb35976a18628cbce96d06284516d69 /ports/fcl/0001_fix_package_detection.patch | |
| parent | 7308c86e5b08abdb593b2eae0da5982ec7d8c4a9 (diff) | |
| download | vcpkg-39079db85f3b4b9cf2a82a1e5cef830e5fd466b3.tar.gz vcpkg-39079db85f3b4b9cf2a82a1e5cef830e5fd466b3.zip | |
[fcl] Update to 0.6.0 (#10025)
* [fcl] Update to 0.6.0
* Add dependency eigen
Diffstat (limited to 'ports/fcl/0001_fix_package_detection.patch')
| -rw-r--r-- | ports/fcl/0001_fix_package_detection.patch | 81 |
1 files changed, 0 insertions, 81 deletions
diff --git a/ports/fcl/0001_fix_package_detection.patch b/ports/fcl/0001_fix_package_detection.patch deleted file mode 100644 index 9ae1b60e5..000000000 --- a/ports/fcl/0001_fix_package_detection.patch +++ /dev/null @@ -1,81 +0,0 @@ -From c43e3771cc2ec314191e5d4a5b485aab258c1b18 Mon Sep 17 00:00:00 2001 -From: Mikhail Paulyshka <me@mixaill.tk> -Date: Sun, 27 Aug 2017 04:12:36 +0300 -Subject: [PATCH] use cmake-exports for package detection - ---- - CMakeLists.txt | 48 +++--------------------------------------------- - 1 file changed, 3 insertions(+), 45 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5a4a559..8978b61 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -65,32 +65,11 @@ if(FCL_COVERALLS) - endif() - - # Find Octomap (optional) --find_package(PkgConfig QUIET) -- - option(FCL_WITH_OCTOMAP "octomap library support" ON) - set(FCL_HAVE_OCTOMAP 0) - if(FCL_WITH_OCTOMAP) -- if(PKG_CONFIG_FOUND) -- pkg_check_modules(OCTOMAP QUIET octomap) -- endif() -- if(NOT OCTOMAP_FOUND) -- # if pkgconfig is not installed, then fall back on more fragile detection -- # of octomap -- find_path(OCTOMAP_INCLUDE_DIRS octomap.h -- PATH_SUFFIXES octomap) -- find_library(OCTOMAP_LIBRARY_DIRS -- ${CMAKE_SHARED_LIBRARY_PREFIX}octomap${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS) -- set(OCTOMAP_LIBRARIES "octomap;octomath") -- endif() -- endif() -- if (OCTOMAP_FOUND OR (OCTOMAP_INCLUDE_DIRS AND OCTOMAP_LIBRARY_DIRS)) -- string(REPLACE "." ";" VERSION_LIST ${OCTOMAP_VERSION}) -- list(GET VERSION_LIST 0 OCTOMAP_MAJOR_VERSION) -- list(GET VERSION_LIST 1 OCTOMAP_MINOR_VERSION) -- list(GET VERSION_LIST 2 OCTOMAP_PATCH_VERSION) -- include_directories(${OCTOMAP_INCLUDE_DIRS}) -- link_directories(${OCTOMAP_LIBRARY_DIRS}) -+ find_package(OCTOMAP REQUIRED) -+ if (OCTOMAP_FOUND) - set(FCL_HAVE_OCTOMAP 1) - message(STATUS "FCL uses Octomap") - else() -@@ -116,28 +95,7 @@ endif() - include_directories(BEFORE "include") - include_directories("${CMAKE_CURRENT_BINARY_DIR}/include") - --if(PKG_CONFIG_FOUND) -- pkg_check_modules(CCD ccd) -- # check to see if the pkg is installed under the libccd name -- if(NOT CCD_FOUND) -- pkg_check_modules(CCD libccd) -- endif() --endif() -- --if(NOT CCD_FOUND) -- # if pkgconfig is not installed, then fall back on more fragile detection -- # of ccd -- find_path(CCD_INCLUDE_DIRS ccd/ccd.h) -- find_library(CCD_LIBRARY -- ${CMAKE_SHARED_LIBRARY_PREFIX}ccd${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(CCD_INCLUDE_DIRS AND CCD_LIBRARY) -- set(CCD_LIBRARIES "${CCD_LIBRARY}") -- else() -- message(FATAL_ERROR "Libccd is required by FCL") -- endif() --endif() --include_directories(${CCD_INCLUDE_DIRS}) --link_directories(${CCD_LIBRARY_DIRS}) -+find_package(CCD REQUIRED) - - add_subdirectory(include/fcl) - add_subdirectory(src) --- -2.12.2.windows.2 - |