Update to new library target names for Conan requirements

thejohnfreeman · May 30, 2024 · edcd653 · edcd653
1 parent 6b4086a
commit edcd653
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 3 deletions.
diff --git a/00-upstream/CMakeLists.txt b/00-upstream/CMakeLists.txt
@@ -74,7 +74,7 @@ endif()
 
 # external executables
 cupcake_assert(NOT TARGET zero::zero)
-#cupcake_assert(TARGET zero::executables) # all executables
+# cupcake_assert(TARGET zero::executables) # all executables?
 cupcake_assert(TARGET zero::executables::zero) # named executable (long)
 cupcake_assert(TARGET zero::e::zero) # named executable (short)
 cupcake_assert(TARGET zero::executable) # main executable
diff --git a/10-special/CMakeLists.txt b/10-special/CMakeLists.txt
@@ -27,3 +27,15 @@ cupcake_enable_testing()
 add_subdirectory(examples)
 
 cupcake_install_project()
+
+# external libraries
+cupcake_assert(TARGET zero::libraries) # all libraries
+cupcake_assert(TARGET zero::libraries::zero) # named library (long)
+cupcake_assert(TARGET zero::l::zero) # named library (short)
+cupcake_assert(TARGET zero::library) # main library
+
+# external executables
+# cupcake_assert(TARGET zero::executables) # all executables?
+# cupcake_assert(TARGET zero::executables::zero) # named executable (long) # TODO
+# cupcake_assert(TARGET zero::e::zero) # named executable (short) # TODO
+# cupcake_assert(TARGET zero::executable) # main executable # TODO
diff --git a/10-special/cupcake.json b/10-special/cupcake.json
@@ -3,7 +3,7 @@
     {
       "name": "zero",
       "file": "zero",
-      "targets": ["zero::libraries::zero"]
+      "targets": ["zero::library"]
     },
     {
       "name": "doctest",

diff --git a/cupcake b/cupcake