From fd1ccdc1b486c0dbc36478facd3ef6a42312716e Mon Sep 17 00:00:00 2001 From: Martin Hierholzer <martin.hierholzer@desy.de> Date: Thu, 28 May 2020 11:04:20 +0200 Subject: [PATCH] FindDOOCS: extend PKG_CONFIG_PATH by directory set via DOOCS_DIR (if set) and the hardcoded default in /export/doocs/... --- cmake/Modules/FindDOOCS.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cmake/Modules/FindDOOCS.cmake b/cmake/Modules/FindDOOCS.cmake index 6a4e9bb..4cc01d4 100644 --- a/cmake/Modules/FindDOOCS.cmake +++ b/cmake/Modules/FindDOOCS.cmake @@ -69,6 +69,12 @@ endforeach() set(DOOCS_FIND_COMPONENTS ${DOOCS_FIND_COMPONENTS_TRANSFORMED}) include(FindPkgConfig) + +if(DEFINED DOOCS_DIR) + set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH}:${DOOCS_DIR}/pkgconfig) +endif() +set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH}:/export/doocs/lib/pkgconfig) +message("Using PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH}") pkg_check_modules(DOOCS REQUIRED ${DOOCS_FIND_COMPONENTS}) string(REPLACE ";" " " DOOCS_CFLAGS "${DOOCS_CFLAGS}") -- GitLab