Fix cupcake.json

thejohnfreeman · Nov 6, 2024 · 6db6fc0 · 6db6fc0
1 parent bc071a8
commit 6db6fc0
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 29 deletions.
diff --git a/10-special/examples/diez/CMakeLists.txt b/10-special/examples/diez/CMakeLists.txt
@@ -12,8 +12,8 @@ cupcake_project()
 cupcake_find_packages(main)
 cupcake_link_libraries(${PROJECT_NAME}.imports.main INTERFACE main)
 
-cupcake_add_libraries(main)
-cupcake_add_executables(main)
+cupcake_add_libraries()
+cupcake_add_executables()
 
 cupcake_enable_testing()
 

diff --git a/10-special/examples/diez/cupcake.json b/10-special/examples/diez/cupcake.json
@@ -1,31 +1,24 @@
 {
-  "groups": {
-    "main": {
-      "imports": [
-        {
-          "name": "ten",
-          "file": "ten",
-          "targets": ["ten::library"]
-        }
-      ],
-      "libraries": [
-        { "name": "diez", "links": [{ "target": "${PROJECT_NAME}.imports.main" }] }
-      ],
-      "executables": [
-        { "name": "diez", "links": [{ "target": "diez.library" }] }
-      ]
+  "imports": [
+    {
+      "name": "ten",
+      "file": "ten",
+      "targets": ["ten::library"]
     },
-    "test": {
-      "imports": [
-        {
-          "name": "doctest",
-          "file": "doctest",
-          "targets": ["doctest::doctest"]
-        }
-      ],
-      "tests": [
-        { "name": "diez", "links": [{ "target": "diez.imports.test" }, { "target": "diez.library" }] }
-      ]
+    {
+      "name": "doctest",
+      "file": "doctest",
+      "targets": ["doctest::doctest"],
+      "groups": ["test"]
     }
-  }
+  ],
+  "libraries": [
+    { "name": "diez", "links": [{ "target": "${PROJECT_NAME}.imports.main" }] }
+  ],
+  "executables": [
+    { "name": "diez", "links": [{ "target": "diez.library" }] }
+  ],
+  "tests": [
+    { "name": "diez", "links": [{ "target": "diez.imports.test" }, { "target": "diez.library" }] }
+  ]
 }