diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-26 15:45:37 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-02-26 15:52:11 (GMT) |
| commit | 7b1c14241ddd120fbf93d206c8b3708b38556263 (patch) | |
| tree | b232aa73a34722cbed5e9af192660c9442118b1e /Modules/Findosg_functions.cmake | |
| parent | 9c1efb614dee294cb3a1077e8a232573f309c605 (diff) | |
| download | CMake-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/Findosg_functions.cmake')
| -rw-r--r-- | Modules/Findosg_functions.cmake | 3 |
1 files changed, 3 insertions, 0 deletions
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) |