From f5fb09192d1ad244006964d2d1425506718d3e58 Mon Sep 17 00:00:00 2001
From: Oliver Reiche <oliver.reiche@huawei.com>
Date: Tue, 14 Feb 2023 17:20:48 +0100
Subject: rules-cc/foreign: Support project sub-directory

---
 CC/foreign/cmake/RULES | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

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

diff --git a/CC/foreign/cmake/RULES b/CC/foreign/cmake/RULES
index 8651f4e..e5c7706 100644
--- a/CC/foreign/cmake/RULES
+++ b/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"}]
-- 
cgit v1.2.3