summaryrefslogtreecommitdiff
path: root/rules/CC/foreign/cmake/RULES
diff options
context:
space:
mode:
authorOliver Reiche <oliver.reiche@huawei.com>2023-05-30 15:38:40 +0200
committerOliver Reiche <oliver.reiche@huawei.com>2023-05-30 15:38:40 +0200
commit14300d3768522b1a201c30c94b6e54e096520b20 (patch)
treeeaa057fd88ddba1a94c48585fcfcbb71628fcbe7 /rules/CC/foreign/cmake/RULES
parent2d7051782625966857286aace6ff18760114ecc7 (diff)
parent9f535dadf06c6c6554bac632069777cf1b63ebf5 (diff)
downloadrules-cc-14300d3768522b1a201c30c94b6e54e096520b20.tar.gz
Merge commit '9f535dadf06c6c6554bac632069777cf1b63ebf5' into rules/rules-cc
Diffstat (limited to 'rules/CC/foreign/cmake/RULES')
-rw-r--r--rules/CC/foreign/cmake/RULES18
1 files changed, 15 insertions, 3 deletions
diff --git a/rules/CC/foreign/cmake/RULES b/rules/CC/foreign/cmake/RULES
index 8651f4e..a53b92e 100644
--- a/rules/CC/foreign/cmake/RULES
+++ b/rules/CC/foreign/cmake/RULES
@@ -2,7 +2,8 @@
{ "doc": ["Data produced by CMake configure, build, and install."]
, "target_fields": ["project"]
, "string_fields":
- [ "options"
+ [ "subdir"
+ , "options"
, "defines"
, "jobs"
, "pre_cmds"
@@ -27,6 +28,10 @@
, "field_doc":
{ "project":
["The CMake project directory. It should contain a single tree artifact"]
+ , "subdir":
+ [ "The subdirectory that contains the entry CMakeLists.txt. Individual"
+ , "directory components are joined with \"/\"."
+ ]
, "options":
[ "CMake options for the configuration phase."
, "(e.g., [\"-GNinja\", \"-Ax64\"])"
@@ -162,6 +167,7 @@
}
}
]
+ , ["cmake_subdir", {"type": "FIELD", "name": "subdir"}]
, ["cmake_options", {"type": "FIELD", "name": "options"}]
, ["cmake_defines", {"type": "FIELD", "name": "defines"}]
, ["cmake_jobs", {"type": "FIELD", "name": "jobs"}]
@@ -218,7 +224,8 @@
{ "doc": ["Library produced by CMake configure, build, and install."]
, "target_fields": ["project", "deps"]
, "string_fields":
- [ "name"
+ [ "subdir"
+ , "name"
, "version"
, "stage"
, "options"
@@ -256,6 +263,10 @@
, "field_doc":
{ "project":
["The CMake project directory. It should contain a single tree artifact"]
+ , "subdir":
+ [ "The subdirectory that contains the entry CMakeLists.txt. Individual"
+ , "directory components are joined with \"/\"."
+ ]
, "name":
[ "The name of the library (without leading \"lib\" or trailing file name"
, "extension), also used as name for pkg-config files."
@@ -509,6 +520,7 @@
]
}
]
+ , ["cmake_subdir", {"type": "FIELD", "name": "subdir"}]
, ["cmake_options", {"type": "FIELD", "name": "options"}]
, ["cmake_defines", {"type": "FIELD", "name": "defines"}]
, ["cmake_jobs", {"type": "FIELD", "name": "jobs"}]
@@ -589,7 +601,7 @@
, "$1": {"type": "FIELD", "name": "stage"}
}
]
- , ["deps-fieldnames", ["deps"]]
+ , ["deps-fieldnames", ["deps", "defaults"]]
]
, "body": {"type": "CALL_EXPRESSION", "name": "prebuilt result"}
}