diff options
| author | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-11-15 10:22:43 +0900 |
|---|---|---|
| committer | Tsukasa Sugiura <t.sugiura0204@gmail.com> | 2017-11-15 10:39:22 +0900 |
| commit | 0e4daf35bae630442dab1750c7f07f2c8bcd1839 (patch) | |
| tree | 9e203b0e940557e239686c356dc2fd656f394ce2 | |
| parent | 1c43dfa4a2921fe80954b2b7d63104a2031fb216 (diff) | |
| download | vcpkg-0e4daf35bae630442dab1750c7f07f2c8bcd1839.tar.gz vcpkg-0e4daf35bae630442dab1750c7f07f2c8bcd1839.zip | |
Fix find debug library of FLANN
Fix find debug library of FLANN.
Currently, QHull port generates debug libraries with DEBUG_POSTFIX
(-gd).
Therefore, It doesn't need to be override.
| -rw-r--r-- | ports/pcl/config.patch | 2 | ||||
| -rw-r--r-- | ports/pcl/find_flann.patch | 11 |
2 files changed, 11 insertions, 2 deletions
diff --git a/ports/pcl/config.patch b/ports/pcl/config.patch index 54b7c6413..1b46ab7ce 100644 --- a/ports/pcl/config.patch +++ b/ports/pcl/config.patch @@ -16,7 +16,7 @@ index f4ef6a0ff..3a2c259dc 100644 PATHS "$ENV{PROGRAMFILES}/flann 1.6.9" "$ENV{PROGRAMW6432}/flann 1.6.9" "$ENV{PROGRAMFILES}/flann" "$ENV{PROGRAMW6432}/flann" - PATH_SUFFIXES lib) -+ PATH_SUFFIXES debug/lib) ++ PATH_SUFFIXES lib debug/lib) find_package_handle_standard_args(Flann DEFAULT_MSG FLANN_LIBRARY FLANN_INCLUDE_DIRS) if(FLANN_FOUND) diff --git a/ports/pcl/find_flann.patch b/ports/pcl/find_flann.patch index 6cbfb011f..e9760e502 100644 --- a/ports/pcl/find_flann.patch +++ b/ports/pcl/find_flann.patch @@ -1,5 +1,5 @@ diff --git a/cmake/Modules/FindFLANN.cmake b/cmake/Modules/FindFLANN.cmake -index b5739dc95..4041a2539 100644 +index b5739dc95..d2c3fd07e 100644 --- a/cmake/Modules/FindFLANN.cmake +++ b/cmake/Modules/FindFLANN.cmake @@ -10,8 +10,8 @@ @@ -13,3 +13,12 @@ index b5739dc95..4041a2539 100644 else(FLANN_USE_STATIC) set(FLANN_RELEASE_NAME flann_cpp) set(FLANN_DEBUG_NAME flann_cpp-gd) +@@ -41,7 +41,7 @@ find_library(FLANN_LIBRARY_DEBUG + NAMES ${FLANN_DEBUG_NAME} ${FLANN_RELEASE_NAME} + HINTS ${PC_FLANN_LIBDIR} ${PC_FLANN_LIBRARY_DIRS} "${FLANN_ROOT}" "$ENV{FLANN_ROOT}" + PATHS "$ENV{PROGRAMFILES}/Flann" "$ENV{PROGRAMW6432}/Flann" +- PATH_SUFFIXES lib) ++ PATH_SUFFIXES lib debug/lib) + + if(NOT FLANN_LIBRARY_DEBUG) + set(FLANN_LIBRARY_DEBUG ${FLANN_LIBRARY}) |