diff options
| author | Alex Richardson <arichardson.kde@gmail.com> | 2015-11-27 12:40:03 +0000 |
|---|---|---|
| committer | Alex Richardson <arichardson.kde@gmail.com> | 2016-01-13 13:51:02 +0000 |
| commit | f5126a3ef0a0876f51d6b9ae3d093a930ca1cbf5 (patch) | |
| tree | 0c1ffaa2d8c8eb98e1228374a56c14d0b9e5fdfe | |
| parent | 3b62d89bc4a66d2f490998de8884fbe6687478c6 (diff) | |
| download | extra-cmake-modules-f5126a3ef0a0876f51d6b9ae3d093a930ca1cbf5.tar.gz extra-cmake-modules-f5126a3ef0a0876f51d6b9ae3d093a930ca1cbf5.tar.bz2 | |
Use PATH_SUFFIXES in ecm_find_package_handle_library_components()
This is required to find poppler without package config as all the headers
are installed in a poppler subdirectory of the include directory
| -rw-r--r-- | modules/ECMFindModuleHelpers.cmake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/ECMFindModuleHelpers.cmake b/modules/ECMFindModuleHelpers.cmake index 2044efe1..6a08b04e 100644 --- a/modules/ECMFindModuleHelpers.cmake +++ b/modules/ECMFindModuleHelpers.cmake @@ -47,7 +47,9 @@ # The <name>_<component>_lib variable should contain the name of this library, # and <name>_<component>_header variable should contain the name of a header # file associated with it (whatever relative path is normally passed to -# '#include'). ecm_find_package_components() will then search for the library +# '#include'). <name>_<component>_header_subdir variable can be used to specify +# which subdirectory of the include path the headers will be found in. +# ecm_find_package_components() will then search for the library # and include directory (creating appropriate cache variables) and create an # imported library target named <name>::<component>. # @@ -218,6 +220,7 @@ macro(ecm_find_package_handle_library_components module_name) find_path(${module_name}_${ecm_fpwc_comp}_INCLUDE_DIR NAMES ${${module_name}_${ecm_fpwc_comp}_header} HINTS ${PKG_${module_name}_${ecm_fpwc_comp}_INCLUDE_DIRS} + PATH_SUFFIXES ${${module_name}_${ecm_fpwc_comp}_header_subdir} ) find_library(${module_name}_${ecm_fpwc_comp}_LIBRARY NAMES ${${module_name}_${ecm_fpwc_comp}_lib} |