diff options
| author | Sascha Roloff <sascha.roloff@huawei.com> | 2023-05-30 15:43:51 +0200 |
|---|---|---|
| committer | Sascha Roloff <sascha.roloff@huawei.com> | 2023-05-31 12:20:07 +0200 |
| commit | 3207a8c0b15d80e77e3addc98fc3d23027bb298b (patch) | |
| tree | 9e5e07ffba1b8fbd9ce98586773fb5c507a28fc0 /CC/foreign/cmake/EXPRESSIONS | |
| parent | 45d0f6390f1d61797740abd65ccee57c78684166 (diff) | |
| download | rules-cc-3207a8c0b15d80e77e3addc98fc3d23027bb298b.tar.gz | |
Update cmake rules to honor dependencies
Diffstat (limited to 'CC/foreign/cmake/EXPRESSIONS')
| -rw-r--r-- | CC/foreign/cmake/EXPRESSIONS | 7 |
1 files changed, 6 insertions, 1 deletions
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"} ] } |