From 7b1c14241ddd120fbf93d206c8b3708b38556263 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 26 Feb 2018 10:45:37 -0500 Subject: 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 --- Modules/Findosg_functions.cmake | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Modules/Findosg_functions.cmake') diff --git a/Modules/Findosg_functions.cmake b/Modules/Findosg_functions.cmake index 83d9844877..60de726e13 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) -- cgit v1.2.1