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

#463) * Finish with the massive renaming --------- Signed-off-by: Jose Luis Rivero <[email protected]>
gazebosim · Nov 25, 2024 · 5f98f61 · 5f98f61
1 parent e08595c
commit 5f98f61
Show file tree

Hide file tree

Showing 62 changed files with 163 additions and 146 deletions.
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -3,71 +3,87 @@ include(GNUInstallDirs)
 
 # test multiple build types
 set(build_types Release RelWithDebInfo Debug)
+function(short_build_type build_type output_var)
+  if (${build_type} STREQUAL "Release")
+      set(bt_str "R")
+    elseif (${build_type} STREQUAL "RelWithDebInfo")
+      set(bt_str "RWD")
+    elseif (${build_type} STREQUAL "Debug")
+      set(bt_str "D")
+    elseif (${build_type} STREQUAL "Coverage")
+      set(bt_str "C")
+    else()
+      message(FATAL_ERROR "Unknown build_type ${build_type}")
+    endif()
+    set (${output_var} ${bt_str} PARENT_SCOPE)
+endfunction()
+
 find_program(EXAMPLE_LCOV_PATH lcov)
 if (NOT WIN32 AND EXAMPLE_LCOV_PATH)
   list(APPEND build_types Coverage)
 endif()
 
 set(example_directories
   ign_conf
-  no_ignition_prefix
+  no_ign_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
   )
 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()
 
 foreach(example ${example_directories})
   set(run_codecheck false)
   if (${example} STREQUAL "ign_conf")
     set(example_tarball_name ignition-minimal-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "no_ignition_prefix")
-    set(example_tarball_name no_ignition_prefix-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "no_ign_prefix")
+    set(example_tarball_name no_ign_prefix-0.1.0.tar.bz2)
   elseif (${example} STREQUAL "prerelease")
     set(example_tarball_name ignition-minimal-1.0.0~pre1.tar.bz2)
-  elseif (${example} STREQUAL "core_nodep")
-    set(example_tarball_name ignition-core_no_deps-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_nodep")
+    set(example_tarball_name ignition-c_no_deps-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_nodep_static")
-    set(example_tarball_name ignition-core_no_deps_static-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_nodep_static")
+    set(example_tarball_name ignition-c_no_deps_static-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_child")
-    set(example_tarball_name ignition-core_child-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_child")
+    set(example_tarball_name ignition-c_child-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_child_private")
-    set(example_tarball_name ignition-core_child_private-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_child_private")
+    set(example_tarball_name ignition-c_child_private-0.1.0.tar.bz2)
     set(run_codecheck true)
-  elseif (${example} STREQUAL "core_static_child")
-    set(example_tarball_name ignition-core_static_child-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "c_static_child")
+    set(example_tarball_name ignition-c_static_child-0.1.0.tar.bz2)
     set(run_codecheck true)
   elseif (${example} STREQUAL "comp_deps")
-    set(example_tarball_name ignition-component_deps-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsA")
-    set(example_tarball_name ignition-use_component_depsa-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsB")
-    set(example_tarball_name ignition-use_component_depsb-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_component_depsC")
-    set(example_tarball_name ignition-use_component_depsc-0.1.0.tar.bz2)
-  elseif (${example} STREQUAL "use_config_ifp")
+    set(example_tarball_name ignition-comp_deps-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsA")
+    set(example_tarball_name ignition-comp_depsa-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsB")
+    set(example_tarball_name ignition-comp_depsb-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "comp_depsC")
+    set(example_tarball_name ignition-comp_depsc-0.1.0.tar.bz2)
+  elseif (${example} STREQUAL "config_ifp")
     set(example_tarball_name  ignition-find_config-0.1.0.tar.bz2)
 
   else()
     set(example_tarball_name)
   endif()
 
   foreach (build_type ${build_types})
-    set(TEST_NAME ${example}_${build_type})
+    short_build_type("${build_type}" bt_str)
+    set(TEST_NAME ${example}_${bt_str})
     string(TIMESTAMP TEST_TIME)
     configure_file(
       "${CMAKE_CURRENT_SOURCE_DIR}/junit_pass.xml.in"
@@ -77,7 +93,7 @@ foreach(example ${example_directories})
       "${CMAKE_CURRENT_SOURCE_DIR}/junit_fail.xml.in"
       "${CMAKE_CURRENT_BINARY_DIR}/test_results/${TEST_NAME}.xml"
       @ONLY)
-    set(example_INSTALL_DIR ${CMAKE_BINARY_DIR}/install/${build_type})
+    set(example_INSTALL_DIR ${CMAKE_BINARY_DIR}/install/${b_str})
     ExternalProject_Add(
       ${TEST_NAME}
 
@@ -163,24 +179,25 @@ endforeach()
 # hard to use DEPENDS in ExternalProject_Add because targets
 # need to exist before they can be used there
 foreach (build_type ${build_types})
-  add_dependencies(core_child_${build_type} core_nodep_${build_type})
-  add_dependencies(core_child_private_${build_type} core_nodep_${build_type})
-  add_dependencies(core_static_child_${build_type} core_nodep_static_${build_type})
-  if (TARGET use_component_depsA_${build_type})
-    add_dependencies(use_component_depsA_${build_type} comp_deps_${build_type})
+  short_build_type(${build_type} bt_str)
+  add_dependencies(c_child_${bt_str} c_nodep_${bt_str})
+  add_dependencies(c_child_private_${bt_str} c_nodep_${bt_str})
+  add_dependencies(c_static_child_${bt_str} c_nodep_static_${bt_str})
+  if (TARGET comp_depsA_${bt_str})
+    add_dependencies(comp_depsA_${bt_str} comp_deps_${bt_str})
   endif()
-  if (TARGET use_component_depsB_${build_type})
-    add_dependencies(use_component_depsB_${build_type} comp_deps_${build_type})
+  if (TARGET comp_depsB_${bt_str})
+    add_dependencies(comp_depsB_${bt_str} comp_deps_${bt_str})
   endif()
-  if (TARGET use_component_depsC_${build_type})
-    add_dependencies(use_component_depsC_${build_type} comp_deps_${build_type})
+  if (TARGET comp_depsC_${bt_str})
+    add_dependencies(comp_depsC_${bt_str} comp_deps_${bt_str})
   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"
@@ -202,7 +219,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.10.2 FATAL_ERROR)
-project(ignition-core_child VERSION 0.1.0)
+project(ignition-c_child VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-core_no_deps REQUIRED)
+ign_find_package(ignition-c_no_deps REQUIRED)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${IGNITION-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 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-core_no_deps::ignition-core_no_deps)
+    ignition-c_no_deps::ignition-c_no_deps)
 ign_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.10.2 FATAL_ERROR)
-project(ignition-core_child_private VERSION 0.1.0)
+project(ignition-c_child_private VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-core_no_deps PRIVATE REQUIRED)
+ign_find_package(ignition-c_no_deps PRIVATE REQUIRED)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${IGNITION-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 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PRIVATE
-    ignition-core_no_deps::ignition-core_no_deps)
+    ignition-c_no_deps::ignition-c_no_deps)
 ign_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,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-core_no_deps VERSION 0.1.0)
+project(ignition-c_no_deps VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
 ign_configure_build(QUIT_IF_BUILD_ERRORS)

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 <ignition/core_no_deps/Export.hh>
+#include <ignition/c_no_deps/Export.hh>
 
 namespace gz
 {
-  namespace core_no_deps
+  namespace c_no_deps
   {
-    class IGNITION_CORE_NO_DEPS_VISIBLE AlmostEmpty
+    class IGNITION_C_NO_DEPS_VISIBLE AlmostEmpty
     {
     };
   }

diff --git a/examples/core_nodep/src/CMakeLists.txt → examples/c_nodep/src/CMakeLists.txt b/examples/core_nodep/src/CMakeLists.txt → examples/c_nodep/src/CMakeLists.txt
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,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-core_no_deps_static VERSION 0.1.0)
+project(ignition-c_no_deps_static VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
 OPTION(BUILD_SHARED_LIBS OFF)

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
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 <ignition/core_no_deps_static/Export.hh>
+#include <ignition/c_no_deps_static/Export.hh>
 
 namespace gz
 {
-  namespace core_no_deps
+  namespace c_no_deps
   {
-    class IGNITION_CORE_NO_DEPS_STATIC_VISIBLE AlmostEmpty
+    class IGNITION_C_NO_DEPS_STATIC_VISIBLE AlmostEmpty
     {
       public: AlmostEmpty() = default;
     };

diff --git a/...ples/core_nodep_static/src/CMakeLists.txt → examples/c_nodep_static/src/CMakeLists.txt b/...ples/core_nodep_static/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.10.2 FATAL_ERROR)
-project(ignition-core_static_child VERSION 0.1.0)
+project(ignition-c_static_child VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-core_no_deps_static REQUIRED)
+ign_find_package(ignition-c_no_deps_static REQUIRED)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_STATIC_DOXYGEN_TAGFILE} = ${IGNITION-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
 
 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_depsC/src/CMakeLists.txt → examples/c_static_child/src/CMakeLists.txt b/...es/use_component_depsC/src/CMakeLists.txt → examples/c_static_child/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-component_deps::ignition-component_deps-child)
+    ignition-c_no_deps_static::ignition-c_no_deps_static)
 ign_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,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-component_deps VERSION 0.1.0)
+project(ignition-comp_deps VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
 ign_configure_build(QUIT_IF_BUILD_ERRORS

diff --git a/examples/comp_deps/src/AlmostEmpty.cc b/examples/comp_deps/src/AlmostEmpty.cc
@@ -15,13 +15,13 @@
  *
 */
 
-#include <ignition/component_deps/Export.hh>
+#include <ignition/comp_deps/Export.hh>
 
 namespace gz
 {
-  namespace component_deps
+  namespace comp_deps
   {
-    class IGNITION_COMPONENT_DEPS_VISIBLE AlmostEmpty
+    class IGNITION_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.10.2 FATAL_ERROR)
-project(ignition-use_component_depsC VERSION 0.1.0)
+project(comp_depsA VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-component_deps REQUIRED COMPONENTS child)
+ign_find_package(ignition-comp_deps REQUIRED COMPONENTS parent child)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs()
diff --git a/examples/use_component_depsA/README.md → examples/comp_depsA/README.md b/examples/use_component_depsA/README.md → examples/comp_depsA/README.md
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 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-component_deps::ignition-component_deps-child)
+    ignition-comp_deps::ignition-comp_deps-child)
 ign_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_depsB/CMakeLists.txt → examples/comp_depsB/CMakeLists.txt b/examples/use_component_depsB/CMakeLists.txt → examples/comp_depsB/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-use_component_depsB VERSION 0.1.0)
+project(comp_depsB VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project()
-ign_find_package(ignition-component_deps REQUIRED COMPONENTS child parent)
+ign_find_package(ignition-comp_deps REQUIRED COMPONENTS child parent)
 ign_configure_build(QUIT_IF_BUILD_ERRORS)
 ign_create_packages()
 ign_create_docs()
diff --git a/examples/use_component_depsB/README.md → examples/comp_depsB/README.md b/examples/use_component_depsB/README.md → examples/comp_depsB/README.md
@@ -4,4 +4,4 @@ This package uses the `child` and `parent` components of `component\_deps`
 and calls `ign_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 `use_component_depsA`.
+this package is identical to `use_comp_depsA`.
diff --git a/...es/use_component_depsA/src/CMakeLists.txt → examples/comp_depsB/src/CMakeLists.txt b/...es/use_component_depsA/src/CMakeLists.txt → examples/comp_depsB/src/CMakeLists.txt
@@ -2,5 +2,5 @@ ign_get_libsources_and_unittests(sources gtest_sources)
 ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
 target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
   PUBLIC
-    ignition-component_deps::ignition-component_deps-child)
+    ignition-comp_deps::ignition-comp_deps-child)
 ign_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/comp_depsC/CMakeLists.txt b/examples/comp_depsC/CMakeLists.txt
@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
+project(comp_depsC VERSION 0.1.0)
+find_package(ignition-cmake2 REQUIRED)
+ign_configure_project()
+ign_find_package(ignition-comp_deps REQUIRED COMPONENTS child)
+ign_configure_build(QUIT_IF_BUILD_ERRORS)
+ign_create_packages()
+ign_create_docs()
diff --git a/examples/use_component_depsC/README.md → examples/comp_depsC/README.md b/examples/use_component_depsC/README.md → examples/comp_depsC/README.md
diff --git a/examples/comp_depsC/src/CMakeLists.txt b/examples/comp_depsC/src/CMakeLists.txt
@@ -0,0 +1,6 @@
+ign_get_libsources_and_unittests(sources gtest_sources)
+ign_create_core_library(SOURCES ${sources} CXX_STANDARD 11)
+target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME}
+  PUBLIC
+    ignition-comp_deps::ignition-comp_deps-child)
+ign_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/...config_ifp/Findignition-find_config.cmake → ...config_ifp/Findignition-find_config.cmake b/...config_ifp/Findignition-find_config.cmake → ...config_ifp/Findignition-find_config.cmake
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/...nfig_ifp/ignition-find_configConfig.cmake → ...nfig_ifp/ignition-find_configConfig.cmake b/...nfig_ifp/ignition-find_configConfig.cmake → ...nfig_ifp/ignition-find_configConfig.cmake
diff --git a/...es/no_ignition_prefix/test/CMakeLists.txt → examples/config_ifp/src/CMakeLists.txt b/...es/no_ignition_prefix/test/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
diff --git a/examples/no_ignition_prefix/CMakeLists.txt → examples/no_ign_prefix/CMakeLists.txt b/examples/no_ignition_prefix/CMakeLists.txt → examples/no_ign_prefix/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(no_ignition_prefix VERSION 0.1.0)
+project(no_ign_prefix VERSION 0.1.0)
 find_package(ignition-cmake2 REQUIRED)
 ign_configure_project(
   NO_IGNITION_PREFIX

diff --git a/examples/no_ignition_prefix/README.md → examples/no_ign_prefix/README.md b/examples/no_ignition_prefix/README.md → examples/no_ign_prefix/README.md
diff --git a/...no_ignition_prefix/include/CMakeLists.txt → ...ples/no_ign_prefix/include/CMakeLists.txt b/...no_ignition_prefix/include/CMakeLists.txt → ...ples/no_ign_prefix/include/CMakeLists.txt
diff --git a/...tion_prefix/include/no_ign/CMakeLists.txt → ..._ign_prefix/include/no_ign/CMakeLists.txt b/...tion_prefix/include/no_ign/CMakeLists.txt → ..._ign_prefix/include/no_ign/CMakeLists.txt
diff --git a/...nition_prefix/include/no_ign/config.hh.in → ...no_ign_prefix/include/no_ign/config.hh.in b/...nition_prefix/include/no_ign/config.hh.in → ...no_ign_prefix/include/no_ign/config.hh.in