diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-27 14:25:49 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-27 14:26:31 (GMT) |
| commit | 2bcccd07bdf4f382776cfb55c716cf09a785fb74 (patch) | |
| tree | 23a8b8139ce44fb7abf0d4b26e4c2b56028f14bb | |
| parent | 2edd5cb9e0b4d0ba84308df3d1d0cfe9345c8ae1 (diff) | |
| parent | 7b1c14241ddd120fbf93d206c8b3708b38556263 (diff) | |
| download | CMake-2bcccd07bdf4f382776cfb55c716cf09a785fb74.zip CMake-2bcccd07bdf4f382776cfb55c716cf09a785fb74.tar.gz CMake-2bcccd07bdf4f382776cfb55c716cf09a785fb74.tar.bz2 | |
Merge topic 'modules-restore-path-suffixes'
7b1c1424 Modules: Restore recently removed search path suffixes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1802
| -rw-r--r-- | Modules/FindGDAL.cmake | 3 | ||||
| -rw-r--r-- | Modules/FindGIF.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindOpenThreads.cmake | 3 | ||||
| -rw-r--r-- | Modules/Findosg_functions.cmake | 3 |
4 files changed, 11 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) diff --git a/Modules/FindGIF.cmake b/Modules/FindGIF.cmake index 4b2f882..efc3973 100644 --- a/Modules/FindGIF.cmake +++ b/Modules/FindGIF.cmake @@ -30,6 +30,7 @@ find_path(GIF_INCLUDE_DIR gif_lib.h HINTS ENV GIF_DIR + PATH_SUFFIXES include ) # the gif library can have many names :-/ @@ -39,6 +40,7 @@ find_library(GIF_LIBRARY NAMES ${POTENTIAL_GIF_LIBS} HINTS ENV GIF_DIR + PATH_SUFFIXES lib ) # see readme.txt diff --git a/Modules/FindOpenThreads.cmake b/Modules/FindOpenThreads.cmake index b1b116a..a197e4d 100644 --- a/Modules/FindOpenThreads.cmake +++ b/Modules/FindOpenThreads.cmake @@ -58,6 +58,7 @@ find_path(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} + PATH_SUFFIXES include ) @@ -73,6 +74,7 @@ find_library(OPENTHREADS_LIBRARY ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) find_library(OPENTHREADS_LIBRARY_DEBUG @@ -88,6 +90,7 @@ find_library(OPENTHREADS_LIBRARY_DEBUG ENV OSG_ROOT ${OPENTHREADS_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) if(OPENTHREADS_LIBRARY_DEBUG) diff --git a/Modules/Findosg_functions.cmake b/Modules/Findosg_functions.cmake index 83d9844..60de726 100644 --- a/Modules/Findosg_functions.cmake +++ b/Modules/Findosg_functions.cmake @@ -28,6 +28,7 @@ function(OSG_FIND_PATH module header) ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} + PATH_SUFFIXES include ) endfunction() @@ -47,6 +48,7 @@ function(OSG_FIND_LIBRARY module library) ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) find_library(${module_uc}_LIBRARY_DEBUG @@ -58,6 +60,7 @@ function(OSG_FIND_LIBRARY module library) ENV OSG_ROOT ${${module_uc}_DIR} ${OSG_DIR} + PATH_SUFFIXES lib ) if(NOT ${module_uc}_LIBRARY_DEBUG) |