Reduce example names to be able to run Conda CI on Windows (gz-cmake4) (

#476) Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com> Signed-off-by: Steve Peters <scpeters@openrobotics.org> Co-authored-by: Steve Peters <scpeters@openrobotics.org>
gazebosim · Feb 25, 2025 · 1c5630a · 1c5630a
1 parent 5db0bf9
commit 1c5630a
Show file tree

Hide file tree

Showing 59 changed files with 156 additions and 156 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -27,20 +27,20 @@ set(example_directories
   gz_conf
   no_gz_prefix
   prerelease
-  core_nodep
-  core_nodep_static
-  core_child
-  core_child_private
-  core_static_child
+  c_nodep
+  c_nodep_static
+  c_child
+  c_child_private
+  c_static_child
   comp_deps
-  use_config_ifp
+  config_ifp
   version_from_package_xml
   )
 if (NOT CMAKE_GENERATOR MATCHES "Visual Studio")
   list(APPEND example_directories
-    use_component_depsA
-    use_component_depsB
-    use_component_depsC
+    comp_depsA
+    comp_depsB
+    comp_depsC
   )
 endif()
 
@@ -52,30 +52,30 @@ foreach(example ${example_directories})
     set(example_tarball_name no_gz_prefix-0.1.0.tar.bz2)
   elseif (${example} STREQUAL "prerelease")
     set(example_tarball_name gz-minimal-1.0.0~pre1.tar.bz2)
-  elseif (${example} STREQUAL "core_nodep")
-    set(example_tarball_name gz-core_no_deps-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_nodep")
+    set(example_tarball_name gz-c_no_deps-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_nodep_static")
-    set(example_tarball_name gz-core_no_deps_static-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_nodep_static")
+    set(example_tarball_name gz-c_no_deps_static-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_child")
-    set(example_tarball_name gz-core_child-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_child")
+    set(example_tarball_name gz-c_child-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_child_private")
-    set(example_tarball_name gz-core_child_private-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_child_private")
+    set(example_tarball_name gz-c_child_private-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_static_child")
-    set(example_tarball_name gz-core_static_child-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_static_child")
+    set(example_tarball_name gz-c_static_child-0.1.0.tar.bz2)
     set(run_codecheck true)
   elseif (${example} STREQUAL "comp_deps")
-    set(example_tarball_name gz-component_deps-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsA")
-    set(example_tarball_name gz-use_component_depsa-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsB")
-    set(example_tarball_name gz-use_component_depsb-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsC")
-    set(example_tarball_name gz-use_component_depsc-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_config_ifp")
+    set(example_tarball_name gz-comp_deps-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsA")
+    set(example_tarball_name gz-comp_depsa-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsB")
+    set(example_tarball_name gz-comp_depsb-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsC")
+    set(example_tarball_name gz-comp_depsc-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "config_ifp")
     set(example_tarball_name  gz-find_config-0.1.0.tar.bz2)
   elseif (${example} STREQUAL "version_from_package_xml")
     set(example_tarball_name  gz-version_from_package_xml-8.21.65.tar.bz2)
@@ -183,24 +183,24 @@ endforeach()
 # need to exist before they can be used there
 foreach (build_type ${build_types})
   shorten_build_type("${build_type}" short_bt)
-  add_dependencies(core_child_${short_bt} core_nodep_${short_bt})
-  add_dependencies(core_child_private_${short_bt} core_nodep_${short_bt})
-  add_dependencies(core_static_child_${short_bt} core_nodep_static_${short_bt})
-  if (TARGET use_component_depsA_${short_bt})
-    add_dependencies(use_component_depsA_${short_bt} comp_deps_${short_bt})
+  add_dependencies(c_child_${short_bt} c_nodep_${short_bt})
+  add_dependencies(c_child_private_${short_bt} c_nodep_${short_bt})
+  add_dependencies(c_static_child_${short_bt} c_nodep_static_${short_bt})
+  if (TARGET comp_depsA_${short_bt})
+    add_dependencies(comp_depsA_${short_bt} comp_deps_${short_bt})
   endif()
-  if (TARGET use_component_depsB_${short_bt})
-    add_dependencies(use_component_depsB_${short_bt} comp_deps_${short_bt})
+  if (TARGET comp_depsB_${short_bt})
+    add_dependencies(comp_depsB_${short_bt} comp_deps_${short_bt})
   endif()
-  if (TARGET use_component_depsC_${short_bt})
-    add_dependencies(use_component_depsC_${short_bt} comp_deps_${short_bt})
+  if (TARGET comp_depsC_${short_bt})
+    add_dependencies(comp_depsC_${short_bt} comp_deps_${short_bt})
   endif()
 endforeach()
 
-# test that core_child pkg-config file requires core_nodep
-# and that core_child_private pkg-config file requires core_nodep privately
+# test that c_child pkg-config file requires c_nodep
+# and that c_child_private pkg-config file requires c_nodep privately
 if (UNIX)
-  set(TEST_NAME core_child_requires_core_nodep)
+  set(TEST_NAME c_child_requires_c_nodep)
   string(TIMESTAMP TEST_TIME)
   configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/junit_pass.xml.in"
@@ -222,7 +222,7 @@ if (UNIX)
 
   list(APPEND _env_vars "PKG_CONFIG_PATH=${example_INSTALL_DIR}/${example_PKGCONFIG_INSTALL_LIBDIR}:${FAKE_INSTALL_PREFIX}/${example_PKGCONFIG_INSTALL_LIBDIR}:$PKG_CONFIG_PATH")
   add_test(${TEST_NAME}
-    ${CMAKE_CURRENT_SOURCE_DIR}/test_core_child_requires_core_no_deps.bash
+    ${CMAKE_CURRENT_SOURCE_DIR}/test_c_child_requires_c_no_deps.bash
   )
   set_tests_properties(${TEST_NAME} PROPERTIES
     ENVIRONMENT "${_env_vars}")

diff --git a/examples/core_child/CMakeLists.txt → examples/c_child/CMakeLists.txt b/examples/core_child/CMakeLists.txt → examples/c_child/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-core_child VERSION 0.1.0)
+project(gz-c_child VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
-gz_find_package(gz-core_no_deps REQUIRED EXTRA_ARGS NAMES gz-core_no_deps)
+gz_find_package(gz-c_no_deps REQUIRED EXTRA_ARGS NAMES gz-c_no_deps)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
 gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_API_URL}")
diff --git a/examples/core_child/README.md → examples/c_child/README.md b/examples/core_child/README.md → examples/c_child/README.md
diff --git a/examples/core_child/include/CMakeLists.txt → examples/c_child/include/CMakeLists.txt b/examples/core_child/include/CMakeLists.txt → examples/c_child/include/CMakeLists.txt
diff --git a/examples/core_child/src/CMakeLists.txt → examples/c_child/src/CMakeLists.txt b/examples/core_child/src/CMakeLists.txt → examples/c_child/src/CMakeLists.txt
@@ -2,5 +2,5 @@ gz_get_libsources_and_unittests(sources gtest_sources)
 gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    gz-core_no_deps::gz-core_no_deps)
+    gz-c_no_deps::gz-c_no_deps)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/core_child/src/empty.cc → examples/c_child/src/empty.cc b/examples/core_child/src/empty.cc → examples/c_child/src/empty.cc
diff --git a/examples/core_child/test/CMakeLists.txt → examples/c_child/test/CMakeLists.txt b/examples/core_child/test/CMakeLists.txt → examples/c_child/test/CMakeLists.txt
diff --git a/examples/core_child_private/CMakeLists.txt → examples/c_child_private/CMakeLists.txt b/examples/core_child_private/CMakeLists.txt → examples/c_child_private/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-core_child_private VERSION 0.1.0)
+project(gz-c_child_private VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
-gz_find_package(gz-core_no_deps PRIVATE REQUIRED)
+gz_find_package(gz-c_no_deps PRIVATE REQUIRED)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
 gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_API_URL}")
diff --git a/examples/core_child_private/README.md → examples/c_child_private/README.md b/examples/core_child_private/README.md → examples/c_child_private/README.md
diff --git a/...core_child_private/include/CMakeLists.txt → ...es/c_child_private/include/CMakeLists.txt b/...core_child_private/include/CMakeLists.txt → ...es/c_child_private/include/CMakeLists.txt
diff --git a/...les/core_child_private/src/CMakeLists.txt → examples/c_child_private/src/CMakeLists.txt b/...les/core_child_private/src/CMakeLists.txt → examples/c_child_private/src/CMakeLists.txt
@@ -2,5 +2,5 @@ gz_get_libsources_and_unittests(sources gtest_sources)
 gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PRIVATE
-    gz-core_no_deps::gz-core_no_deps)
+    gz-c_no_deps::gz-c_no_deps)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/core_child_private/src/empty.cc → examples/c_child_private/src/empty.cc b/examples/core_child_private/src/empty.cc → examples/c_child_private/src/empty.cc
diff --git a/...es/core_child_private/test/CMakeLists.txt → examples/c_child_private/test/CMakeLists.txt b/...es/core_child_private/test/CMakeLists.txt → examples/c_child_private/test/CMakeLists.txt
diff --git a/examples/core_nodep/CMakeLists.txt → examples/c_nodep/CMakeLists.txt b/examples/core_nodep/CMakeLists.txt → examples/c_nodep/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-core_no_deps VERSION 0.1.0)
+project(gz-c_no_deps VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project(
-  REPLACE_INCLUDE_PATH gz/core_no_deps
+  REPLACE_INCLUDE_PATH gz/c_no_deps
 )
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()

diff --git a/examples/core_nodep/README.md → examples/c_nodep/README.md b/examples/core_nodep/README.md → examples/c_nodep/README.md
diff --git a/examples/core_nodep/include/CMakeLists.txt → examples/c_nodep/include/CMakeLists.txt b/examples/core_nodep/include/CMakeLists.txt → examples/c_nodep/include/CMakeLists.txt
diff --git a/examples/core_nodep/src/AlmostEmpty.cc → examples/c_nodep/src/AlmostEmpty.cc b/examples/core_nodep/src/AlmostEmpty.cc → examples/c_nodep/src/AlmostEmpty.cc
@@ -15,13 +15,13 @@
  *
 */
 
-#include <gz/core_no_deps/Export.hh>
+#include <gz/c_no_deps/Export.hh>
 
 namespace gz
 {
-  namespace core_no_deps
+  namespace c_no_deps
   {
-    class GZ_CORE_NO_DEPS_VISIBLE AlmostEmpty
+    class GZ_C_NO_DEPS_VISIBLE AlmostEmpty
     {
     };
   }

diff --git a/...ples/core_nodep_static/src/CMakeLists.txt → examples/c_nodep/src/CMakeLists.txt b/...ples/core_nodep_static/src/CMakeLists.txt → examples/c_nodep/src/CMakeLists.txt
@@ -1,3 +1,3 @@
 gz_get_libsources_and_unittests(sources gtest_sources)
 gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
-gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
+gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/core_nodep/test/CMakeLists.txt → examples/c_nodep/test/CMakeLists.txt b/examples/core_nodep/test/CMakeLists.txt → examples/c_nodep/test/CMakeLists.txt
diff --git a/examples/core_nodep_static/CMakeLists.txt → examples/c_nodep_static/CMakeLists.txt b/examples/core_nodep_static/CMakeLists.txt → examples/c_nodep_static/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-core_no_deps_static VERSION 0.1.0)
+project(gz-c_no_deps_static VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project(
-  REPLACE_INCLUDE_PATH gz/core_no_deps_static
+  REPLACE_INCLUDE_PATH gz/c_no_deps_static
 )
 OPTION(BUILD_SHARED_LIBS OFF)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/core_nodep_static/README.md → examples/c_nodep_static/README.md b/examples/core_nodep_static/README.md → examples/c_nodep_static/README.md
@@ -1,4 +1,4 @@
-# core\_nodep\_static example
+# c\_nodep\_static example
 
 This package sets the `BUILD_SHARED_LIBS` cmake variable to `OFF`,
 ensuring that a static library will be created.

diff --git a/.../core_nodep_static/include/CMakeLists.txt → ...les/c_nodep_static/include/CMakeLists.txt b/.../core_nodep_static/include/CMakeLists.txt → ...les/c_nodep_static/include/CMakeLists.txt
diff --git a/...ples/core_nodep_static/src/AlmostEmpty.cc → examples/c_nodep_static/src/AlmostEmpty.cc b/...ples/core_nodep_static/src/AlmostEmpty.cc → examples/c_nodep_static/src/AlmostEmpty.cc
@@ -15,13 +15,13 @@
  *
 */
 
-#include <gz/core_no_deps_static/Export.hh>
+#include <gz/c_no_deps_static/Export.hh>
 
 namespace gz
 {
-  namespace core_no_deps
+  namespace c_no_deps
   {
-    class GZ_CORE_NO_DEPS_STATIC_VISIBLE AlmostEmpty
+    class GZ_C_NO_DEPS_STATIC_VISIBLE AlmostEmpty
     {
       public: AlmostEmpty() = default;
     };

diff --git a/examples/core_nodep/src/CMakeLists.txt → examples/c_nodep_static/src/CMakeLists.txt b/examples/core_nodep/src/CMakeLists.txt → examples/c_nodep_static/src/CMakeLists.txt
diff --git a/...les/core_nodep_static/test/CMakeLists.txt → examples/c_nodep_static/test/CMakeLists.txt b/...les/core_nodep_static/test/CMakeLists.txt → examples/c_nodep_static/test/CMakeLists.txt
diff --git a/examples/core_static_child/CMakeLists.txt → examples/c_static_child/CMakeLists.txt b/examples/core_static_child/CMakeLists.txt → examples/c_static_child/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-core_static_child VERSION 0.1.0)
+project(gz-c_static_child VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
-gz_find_package(gz-core_no_deps_static REQUIRED)
+gz_find_package(gz-c_no_deps_static REQUIRED)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
 gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_STATIC_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_STATIC_API_URL}")
diff --git a/examples/core_static_child/README.md → examples/c_static_child/README.md b/examples/core_static_child/README.md → examples/c_static_child/README.md
@@ -1,9 +1,9 @@
-# core\_static\_child example
+# c\_static\_child example
 
 This package links against that static library provided by
-the `core_no_deps_static` package.
+the `c_no_deps_static` package.
 
-To build, ensure that `core_no_deps_static` has been installed somewhere
+To build, ensure that `c_no_deps_static` has been installed somewhere
 in your `CMAKE_PREFIX_PATH` and then run:
 
 ~~~

diff --git a/.../core_static_child/include/CMakeLists.txt → ...les/c_static_child/include/CMakeLists.txt b/.../core_static_child/include/CMakeLists.txt → ...les/c_static_child/include/CMakeLists.txt
diff --git a/...es/use_component_depsA/src/CMakeLists.txt → examples/c_static_child/src/CMakeLists.txt b/...es/use_component_depsA/src/CMakeLists.txt → examples/c_static_child/src/CMakeLists.txt
@@ -2,5 +2,5 @@ gz_get_libsources_and_unittests(sources gtest_sources)
 gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    gz-component_deps::gz-component_deps-child)
+    gz-c_no_deps_static::gz-c_no_deps_static)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/core_static_child/src/empty.cc → examples/c_static_child/src/empty.cc b/examples/core_static_child/src/empty.cc → examples/c_static_child/src/empty.cc
diff --git a/...les/core_static_child/test/CMakeLists.txt → examples/c_static_child/test/CMakeLists.txt b/...les/core_static_child/test/CMakeLists.txt → examples/c_static_child/test/CMakeLists.txt
diff --git a/examples/comp_deps/CMakeLists.txt b/examples/comp_deps/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-component_deps VERSION 0.1.0)
+project(gz-comp_deps VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project(
-  REPLACE_INCLUDE_PATH gz/component_deps
+  REPLACE_INCLUDE_PATH gz/comp_deps
 )
 gz_configure_build(QUIT_IF_BUILD_ERRORS
   COMPONENTS child parent)

diff --git a/examples/comp_deps/README.md b/examples/comp_deps/README.md
@@ -1,4 +1,4 @@
-# component\_deps
+# comp\_deps
 
 A package with two components (`child` and `parent`) with a dependency
 relationship between the components (`child` links against `parent`).
diff --git a/examples/comp_deps/src/AlmostEmpty.cc b/examples/comp_deps/src/AlmostEmpty.cc
@@ -15,13 +15,13 @@
  *
 */
 
-#include <gz/component_deps/Export.hh>
+#include <gz/comp_deps/Export.hh>
 
 namespace gz
 {
-  namespace component_deps
+  namespace c_deps
   {
-    class GZ_COMPONENT_DEPS_VISIBLE AlmostEmpty
+    class GZ_COMP_DEPS_VISIBLE AlmostEmpty
     {
     };
   }

diff --git a/examples/use_component_depsC/CMakeLists.txt → examples/comp_depsA/CMakeLists.txt b/examples/use_component_depsC/CMakeLists.txt → examples/comp_depsA/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-use_component_depsC VERSION 0.1.0)
+project(gz-comp_depsA VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
-gz_find_package(gz-component_deps REQUIRED COMPONENTS child)
+gz_find_package(gz-comp_deps REQUIRED COMPONENTS parent child)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
 gz_create_docs()
diff --git a/examples/comp_depsA/README.md b/examples/comp_depsA/README.md
@@ -0,0 +1,5 @@
+# comp\_depsA
+
+This package uses the `child` and `parent` components of `comp_deps`
+and calls `gz_find_package` with the components specified
+in the order `parent child`.
diff --git a/...es/use_component_depsB/src/CMakeLists.txt → examples/comp_depsA/src/CMakeLists.txt b/...es/use_component_depsB/src/CMakeLists.txt → examples/comp_depsA/src/CMakeLists.txt
@@ -2,5 +2,5 @@ gz_get_libsources_and_unittests(sources gtest_sources)
 gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    gz-component_deps::gz-component_deps-child)
+    gz-comp_deps::gz-comp_deps-child)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/use_component_depsA/src/empty.cc → examples/comp_depsA/src/empty.cc b/examples/use_component_depsA/src/empty.cc → examples/comp_depsA/src/empty.cc
diff --git a/examples/use_component_depsA/CMakeLists.txt → examples/comp_depsB/CMakeLists.txt b/examples/use_component_depsA/CMakeLists.txt → examples/comp_depsB/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-use_component_depsA VERSION 0.1.0)
+project(comp_depsB VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
-gz_find_package(gz-component_deps REQUIRED COMPONENTS parent child)
+gz_find_package(gz-comp_deps REQUIRED COMPONENTS child parent)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
 gz_create_docs()
diff --git a/examples/comp_depsB/README.md b/examples/comp_depsB/README.md
@@ -0,0 +1,7 @@
+# comp\_depsB
+
+This package uses the `child` and `parent` components of `comp_deps`
+and calls `gz_find_package` with the components specified
+in the order `child parent`.
+Aside from the order in which the components are specified,
+this package is identical to `comp_depsA`.
diff --git a/...es/use_component_depsC/src/CMakeLists.txt → examples/comp_depsB/src/CMakeLists.txt b/...es/use_component_depsC/src/CMakeLists.txt → examples/comp_depsB/src/CMakeLists.txt
@@ -2,5 +2,5 @@ gz_get_libsources_and_unittests(sources gtest_sources)
 gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    gz-component_deps::gz-component_deps-child)
+    gz-comp_deps::gz-comp_deps-child)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/use_component_depsB/src/empty.cc → examples/comp_depsB/src/empty.cc b/examples/use_component_depsB/src/empty.cc → examples/comp_depsB/src/empty.cc
diff --git a/examples/use_component_depsB/CMakeLists.txt → examples/comp_depsC/CMakeLists.txt b/examples/use_component_depsB/CMakeLists.txt → examples/comp_depsC/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
-project(gz-use_component_depsB VERSION 0.1.0)
+project(comp_depsC VERSION 0.1.0)
 find_package(gz-cmake4 REQUIRED)
 gz_configure_project()
-gz_find_package(gz-component_deps REQUIRED COMPONENTS child parent)
+gz_find_package(gz-comp_deps REQUIRED COMPONENTS child)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
 gz_create_docs()
diff --git a/examples/comp_depsC/README.md b/examples/comp_depsC/README.md
@@ -0,0 +1,4 @@
+# comp\_depsC
+
+This package uses the `child` component of `comp_deps`
+but should also find the `parent` component indirectly.
diff --git a/examples/comp_depsC/src/CMakeLists.txt b/examples/comp_depsC/src/CMakeLists.txt
@@ -0,0 +1,6 @@
+gz_get_libsources_and_unittests(sources gtest_sources)
+gz_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
+target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
+  PUBLIC
+    gz-comp_deps::gz-comp_deps-child)
+gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/use_component_depsC/src/empty.cc → examples/comp_depsC/src/empty.cc b/examples/use_component_depsC/src/empty.cc → examples/comp_depsC/src/empty.cc
diff --git a/examples/use_config_ifp/CMakeLists.txt → examples/config_ifp/CMakeLists.txt b/examples/use_config_ifp/CMakeLists.txt → examples/config_ifp/CMakeLists.txt
diff --git a/examples/config_ifp/Findgz-find_config.cmake b/examples/config_ifp/Findgz-find_config.cmake
@@ -0,0 +1 @@
+set(CONFIG_TEST "The package was found using MODULE mode")
diff --git a/examples/use_config_ifp/README.md → examples/config_ifp/README.md b/examples/use_config_ifp/README.md → examples/config_ifp/README.md
diff --git a/examples/config_ifp/gz-find_configConfig.cmake b/examples/config_ifp/gz-find_configConfig.cmake
@@ -0,0 +1 @@
+set(CONFIG_TEST "The package was found using CONFIG mode")
diff --git a/examples/use_config_ifp/src/CMakeLists.txt → examples/config_ifp/src/CMakeLists.txt b/examples/use_config_ifp/src/CMakeLists.txt → examples/config_ifp/src/CMakeLists.txt
diff --git a/examples/core_static_child/src/CMakeLists.txt b/examples/core_static_child/src/CMakeLists.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		set(CONFIG_TEST "The package was found using MODULE mode")