diff options
author | Sascha Roloff <sascha.roloff@huawei.com> | 2023-05-31 12:29:42 +0200 |
---|---|---|
committer | Sascha Roloff <sascha.roloff@huawei.com> | 2023-05-31 12:29:42 +0200 |
commit | 6bae849b9242378d286c80d08a903f143027328b (patch) | |
tree | 83c17a72637c6cddc1a379fd5d7e96ac907a85c3 /rules/CC/foreign/cmake/EXPRESSIONS | |
parent | ac9563009ba6025ff9bd8c0124e2aa072ef03f86 (diff) | |
parent | 3207a8c0b15d80e77e3addc98fc3d23027bb298b (diff) | |
download | rules-cc-6bae849b9242378d286c80d08a903f143027328b.tar.gz |
Merge subtree 'rules' into rules-cc
Diffstat (limited to 'rules/CC/foreign/cmake/EXPRESSIONS')
-rw-r--r-- | rules/CC/foreign/cmake/EXPRESSIONS | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/rules/CC/foreign/cmake/EXPRESSIONS b/rules/CC/foreign/cmake/EXPRESSIONS index 4c21f4b..88dd8a1 100644 --- a/rules/CC/foreign/cmake/EXPRESSIONS +++ b/rules/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"} ] } |