From 2739904510989fd851ecfcb666a35e71a2a68fdc Mon Sep 17 00:00:00 2001
From: Dietrich Rothe <dietrich.rothe@desy.de>
Date: Fri, 12 May 2023 11:17:51 +0200
Subject: [PATCH] project-template: prepend pkgconfig for user-set DOOCS_DIR
this makes sure system-installed DOOCS is overwritten
also, we need lib/x86_64_linux-gnu/pkgconfig since e.g. gul installs there
---
cmake/Modules/FindDOOCS.cmake | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/cmake/Modules/FindDOOCS.cmake b/cmake/Modules/FindDOOCS.cmake
index de99e1d..65608bd 100644
--- a/cmake/Modules/FindDOOCS.cmake
+++ b/cmake/Modules/FindDOOCS.cmake
@@ -45,16 +45,18 @@ set(DOOCS_noAsNeededFlag 1)
# note, helper functions and variables should also be prefixed with DOOCS_, since everything is exported to
# project calling find_package(DOOCS)
-function (DOOCS_addToPkgConfPath newPath)
+function (DOOCS_prependToPkgConfPath newPath)
if (NOT (":$ENV{PKG_CONFIG_PATH}:" MATCHES ":${newPath}:"))
- set(ENV{PKG_CONFIG_PATH} $ENV{PKG_CONFIG_PATH}:${newPath})
+ set(ENV{PKG_CONFIG_PATH} ${newPath}:$ENV{PKG_CONFIG_PATH})
endif()
endfunction()
+DOOCS_prependToPkgConfPath(/export/doocs/lib/pkgconfig)
if(DOOCS_DIR)
- DOOCS_addToPkgConfPath(${DOOCS_DIR}/pkgconfig)
+ # prepend pkgconfig for user-set doocs dir; this makes sure system-installed DOOCS is overwritten
+ DOOCS_prependToPkgConfPath(${DOOCS_DIR}/x86_64-linux-gnu/pkgconfig)
+ DOOCS_prependToPkgConfPath(${DOOCS_DIR}/pkgconfig)
endif()
-DOOCS_addToPkgConfPath(/export/doocs/lib/pkgconfig)
if (NOT DOOCS_FIND_QUIETLY)
message("FindDOOCS: Using PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH}")
endif()
--
GitLab