From 3207a8c0b15d80e77e3addc98fc3d23027bb298b Mon Sep 17 00:00:00 2001
From: Sascha Roloff <sascha.roloff@huawei.com>
Date: Tue, 30 May 2023 15:43:51 +0200
Subject: Update cmake rules to honor dependencies

---
 CC/foreign/cmake/EXPRESSIONS | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'CC/foreign/cmake/EXPRESSIONS')

diff --git a/CC/foreign/cmake/EXPRESSIONS b/CC/foreign/cmake/EXPRESSIONS
index 4c21f4b..88dd8a1 100644
--- a/CC/foreign/cmake/EXPRESSIONS
+++ b/CC/foreign/cmake/EXPRESSIONS
@@ -2,6 +2,7 @@
   { "vars":
     [ "source_dir"
     , "cmake_subdir"
+    , "localbase_dir"
     , "cmake_options"
     , "cmake_defines"
     , "cmake_jobs"
@@ -180,7 +181,7 @@
                   , [ "readonly CMAKE_SUBDIR=\"$1\""
                     , "readonly CMAKE_AR=$(which $2)"
                     , "shift 2"
-                    , "cmake \"$@\" -S\"source/${CMAKE_SUBDIR}\" -Bbuild -DCMAKE_AR=${CMAKE_AR} -DCMAKE_INSTALL_PREFIX=./install >configure.log 2>&1 || (cat configure.log && exit 1)"
+                    , "cmake \"$@\" -S\"source/${CMAKE_SUBDIR}\" -Bbuild -DCMAKE_AR=${CMAKE_AR} -DCMAKE_INSTALL_PREFIX=./install -DCMAKE_PREFIX_PATH=\"$(pwd)/localbase\" -DPKG_CONFIG_ARGN=--define-prefix --no-warn-unused-cli >configure.log 2>&1 || (cat configure.log && exit 1)"
                     ]
                   , [ { "type": "join"
                       , "separator": " "
@@ -225,6 +226,10 @@
         , "$1":
           [ {"type": "var", "name": "TOOLCHAIN"}
           , {"type": "var", "name": "source_dir"}
+          , { "type": "var"
+            , "name": "localbase_dir"
+            , "default": {"type": "empty_map"}
+            }
           , {"type": "var", "name": "script"}
           ]
         }
-- 
cgit v1.2.3