summaryrefslogtreecommitdiffstats
path: root/Modules/FindGDAL.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-02-26 15:45:37 (GMT)
committerBrad King <brad.king@kitware.com>2018-02-26 15:52:11 (GMT)
commit7b1c14241ddd120fbf93d206c8b3708b38556263 (patch)
treeb232aa73a34722cbed5e9af192660c9442118b1e /Modules/FindGDAL.cmake
parent9c1efb614dee294cb3a1077e8a232573f309c605 (diff)
downloadCMake-7b1c14241ddd120fbf93d206c8b3708b38556263.zip
CMake-7b1c14241ddd120fbf93d206c8b3708b38556263.tar.gz
CMake-7b1c14241ddd120fbf93d206c8b3708b38556263.tar.bz2
Modules: Restore recently removed search path suffixes
Refactoring in commit v3.11.0-rc1~293^2~4 (Modules: Remove paths set as global Unix prefixes, 2017-11-20) removed `PATH_SUFFIXES` options that appeared to be used to cover subdirectories of the `PATHS` options that were also removed. However, the path suffixes also apply to other search paths and so should not be removed. Restore them. Fixes: #17760
Diffstat (limited to 'Modules/FindGDAL.cmake')
-rw-r--r--Modules/FindGDAL.cmake3
1 files changed, 3 insertions, 0 deletions
diff --git a/Modules/FindGDAL.cmake b/Modules/FindGDAL.cmake
index ceb8eee..2b940b0 100644
--- a/Modules/FindGDAL.cmake
+++ b/Modules/FindGDAL.cmake
@@ -49,6 +49,7 @@ find_path(GDAL_INCLUDE_DIR gdal.h
PATH_SUFFIXES
include/gdal
include/GDAL
+ include
)
if(UNIX)
@@ -60,6 +61,7 @@ if(UNIX)
HINTS
ENV GDAL_DIR
ENV GDAL_ROOT
+ PATH_SUFFIXES bin
)
if(GDAL_CONFIG)
@@ -79,6 +81,7 @@ find_library(GDAL_LIBRARY
ENV GDAL_DIR
ENV GDAL_ROOT
${_gdal_libpath}
+ PATH_SUFFIXES lib
)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)