Rename CMake project to gz (#244)

Signed-off-by: Louise Poubel <[email protected]> Signed-off-by: methylDragon <[email protected]> Co-authored-by: methylDragon <[email protected]>
gazebosim · Jun 25, 2022 · dc51157 · dc51157
1 parent 47a949d
commit dc51157
Show file tree

Hide file tree

Showing 35 changed files with 104 additions and 104 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(ignition-cmake3 VERSION 3.0.0)
+project(gz-cmake3 VERSION 3.0.0)
 
 #--------------------------------------
 # Initialize the IGNITION_CMAKE_DIR variable with the location of the cmake
@@ -59,7 +59,7 @@ set(gz_config_output "${PROJECT_NAME_LOWER}-config.cmake")
 set(gz_version_output "${PROJECT_NAME_LOWER}-config-version.cmake")
 set(gz_config_install_dir "${CMAKE_INSTALL_DATAROOTDIR}/cmake/${PROJECT_NAME_LOWER}")
 set(ign_pkgconfig_input "${CMAKE_CURRENT_SOURCE_DIR}/config/ignition-cmake.pc.in")
-set(ign_pkgconfig_output "${CMAKE_BINARY_DIR}/ignition-cmake${PROJECT_VERSION_MAJOR}.pc")
+set(ign_pkgconfig_output "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
 set(ign_pkgconfig_install_dir "${IGN_LIB_INSTALL_DIR}/pkgconfig")
 set(ign_utilities_target ${PROJECT_EXPORT_NAME}-utilities)
 set(ign_utilities_import_target_name ${PROJECT_EXPORT_NAME}::${ign_utilities_target})

diff --git a/cmake/IgnCMake.cmake b/cmake/IgnCMake.cmake
@@ -20,7 +20,7 @@
 # limitations under the License.
 
 #============================================================================
-# ignition-cmake modules
+# gz-cmake modules
 #============================================================================
 include(IgnUtils)
 include(IgnConfigureProject)

diff --git a/cmake/IgnPackaging.cmake b/cmake/IgnPackaging.cmake
@@ -175,10 +175,10 @@ endmacro()
 # component's name.
 #
 # NOTE: This will be called automatically by gz_create_core_library(~) and
-#       gz_add_component(~), so users of ignition-cmake should not call this
+#       gz_add_component(~), so users of gz-cmake should not call this
 #       function.
 #
-# NOTE: For ignition-cmake developers, the variables needed by ignition.pc.in or
+# NOTE: For gz-cmake developers, the variables needed by ignition.pc.in or
 #       ignition-component.pc.in MUST be set before calling this function.
 #
 # Create a pkgconfig file for your target, and install it.
@@ -235,10 +235,10 @@ endfunction()
 # can be used to specify the prefix of these variables.
 #
 # NOTE: This will be called automatically by gz_create_core_library(~) and
-#       gz_add_component(~), so users of ignition-cmake should not call this
+#       gz_add_component(~), so users of gz-cmake should not call this
 #       function.
 #
-# NOTE: For ignition-cmake developers, some of the variables needed by
+# NOTE: For gz-cmake developers, some of the variables needed by
 #       ignition-config.cmake.in or ignition-component-config.cmake.in MUST be
 #       set before calling this function. The following variables are set
 #       automatically by this function:

diff --git a/cmake/IgnUtils.cmake b/cmake/IgnUtils.cmake
@@ -109,7 +109,7 @@
 #  ==========================================================================
 #  The following arguments pertain to the automatic generation of your
 #  project's pkgconfig file. Ideally, this information should be provided
-#  automatically by ignition-cmake through the cmake find-module that is written
+#  automatically by gz-cmake through the cmake find-module that is written
 #  for your dependency. However, if your package gets distributed with its own
 #  cmake config-file or find-module, then it might not automatically set this
 #  information. Therefore, we provide the ability to set it through your call to
@@ -827,7 +827,7 @@ function(gz_install_all_headers)
       message(FATAL_ERROR
         "Developer error: You are missing the file [${config_header_in}]! "
         "Did you forget to move it from your project's cmake directory while "
-        "migrating to the use of ignition-cmake?")
+        "migrating to the use of gz-cmake?")
     endif()
 
     # Generate the "config" header that describes our project configuration
@@ -1425,14 +1425,14 @@ endfunction()
 # Used internally by _gz_add_library_or_component to report argument errors
 macro(_gz_add_library_or_component_arg_error missing_arg)
 
-  message(FATAL_ERROR "ignition-cmake developer error: Must specify "
+  message(FATAL_ERROR "gz-cmake developer error: Must specify "
                       "${missing_arg} to _gz_add_library_or_component!")
 
 endmacro()
 
 #################################################
-# This is only meant for internal use by ignition-cmake. If you are a consumer
-# of ignition-cmake, please use gz_create_core_library(~) or
+# This is only meant for internal use by gz-cmake. If you are a consumer
+# of gz-cmake, please use gz_create_core_library(~) or
 # gz_add_component(~) instead of this.
 #
 # _gz_add_library_or_component(LIB_NAME <lib_name>
@@ -1822,7 +1822,7 @@ macro(gz_build_tests)
 
   if(NOT gz_build_tests_TYPE)
     # If you have encountered this error, you are probably migrating to the
-    # new ignition-cmake system. Be sure to also provide a SOURCES argument
+    # new gz-cmake system. Be sure to also provide a SOURCES argument
     # when calling gz_build_tests.
     message(FATAL_ERROR "Developer error: You must specify a TYPE for your tests!")
   endif()
@@ -1932,8 +1932,8 @@ macro(_gz_cmake_parse_arguments prefix options oneValueArgs multiValueArgs)
     message(AUTHOR_WARNING
       "\nThe build script has specified some unrecognized arguments for ${prefix}(~):\n"
       "${${prefix}_UNPARSED_ARGUMENTS}\n"
-      "Either the script has a typo, or it is using an unexpected version of ign-cmake. "
-      "The version of ign-cmake currently being used is ${ignition-cmake${IGNITION_CMAKE_VERSION_MAJOR}_VERSION}\n")
+      "Either the script has a typo, or it is using an unexpected version of gz-cmake. "
+      "The version of gz-cmake currently being used is ${gz-cmake${IGNITION_CMAKE_VERSION_MAJOR}_VERSION}\n")
 
   endif()
 

diff --git a/cmake/ign_auto_headers.hh.in b/cmake/ign_auto_headers.hh.in
@@ -17,7 +17,7 @@
 
 //                ****** Do not modify this file. ******
 // This file is automatically generated by CMake. Changes should instead be
-// made to cmake/ign_auto_headers.hh.in in ignition-cmake
+// made to cmake/ign_auto_headers.hh.in in gz-cmake
 
 #include <@PROJECT_INCLUDE_DIR@/config.hh>
 ${ign_headers}
diff --git a/cmake/ignition-component-config.cmake.in b/cmake/ignition-component-config.cmake.in
@@ -45,9 +45,9 @@ endif()
 # Get access to the find_dependency utility
 include(CMakeFindDependencyMacro)
 
-# Find ignition-cmake, because we need its modules in order to find the rest of
+# Find gz-cmake, because we need its modules in order to find the rest of
 # our dependencies.
-find_dependency(ignition-cmake@IGNITION_CMAKE_VERSION_MAJOR@)
+find_dependency(gz-cmake@IGNITION_CMAKE_VERSION_MAJOR@)
 
 # Set the REQUIRED flag for the find_package(~) calls on this component's
 # dependencies.
@@ -109,6 +109,6 @@ endif()
 
 set(@component_pkg_name@_LIBRARY @import_target_name@)
 
-# This macro is used by ignition-cmake to automatically configure the pkgconfig
+# This macro is used by gz-cmake to automatically configure the pkgconfig
 # files for ignition projects.
 gz_pkg_config_entry(@component_pkg_name@ "@component_pkg_name@")
diff --git a/cmake/ignition-config.cmake.in b/cmake/ignition-config.cmake.in
@@ -58,9 +58,9 @@ set(@PKG_NAME@_CONFIG_INCLUDED TRUE)
 
 # Get access to the find_dependency utility
 include(CMakeFindDependencyMacro)
-# Find ignition-cmake, because we need its modules in order to find the rest of
+# Find gz-cmake, because we need its modules in order to find the rest of
 # our dependencies.
-find_dependency(ignition-cmake@IGNITION_CMAKE_VERSION_MAJOR@)
+find_dependency(gz-cmake@IGNITION_CMAKE_VERSION_MAJOR@)
 
 # Set the REQUIRED flag for the find_package(~) calls on this project's
 # dependencies.
@@ -143,7 +143,7 @@ set_and_check(@PKG_NAME@_INCLUDE_DIRS "@PACKAGE_IGN_INCLUDE_INSTALL_DIR_FULL@")
 set(@LEGACY_PROJECT_PREFIX@_LIBRARIES ${@PKG_NAME@_LIBRARIES})
 set(@LEGACY_PROJECT_PREFIX@_INCLUDE_DIRS ${@PKG_NAME@_INCLUDE_DIRS})
 
-# This macro is used by ignition-cmake to automatically configure the pkgconfig
+# This macro is used by gz-cmake to automatically configure the pkgconfig
 # files for ignition projects.
 gz_pkg_config_entry(@PKG_NAME@ "@PKG_NAME@")
 

diff --git a/cmake/pkgconfig/ignition-component.pc.in b/cmake/pkgconfig/ignition-component.pc.in
@@ -4,7 +4,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@IGN_INCLUDE_INSTALL_DIR_POSTFIX
 
 Name: Ignition @IGN_DESIGNATION@ @component_name@
 Description: A set of @IGN_DESIGNATION@ @component_name@ classes for robot applications
-Version: ignition-cmake@IGNITION_CMAKE_VERSION_MAJOR@ >= 1.1 @PROJECT_VERSION_FULL_NO_SUFFIX@
+Version: @PROJECT_VERSION_FULL_NO_SUFFIX@
 Requires: @component_pkgconfig_requires@
 Requires.private: @component_pkgconfig_requires_private@
 Libs: -L${libdir} @component_pkgconfig_lib@ @component_pkgconfig_lib_deps@

diff --git a/cmake/pkgconfig/ignition.pc.in b/cmake/pkgconfig/ignition.pc.in
@@ -5,7 +5,7 @@ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@IGN_INCLUDE_INSTALL_DIR_POSTFIX
 Name: Ignition @IGN_DESIGNATION@
 Description: A set of @IGN_DESIGNATION@ classes for robot applications
 Version: @PROJECT_VERSION_FULL_NO_SUFFIX@
-Requires: ignition-cmake@IGNITION_CMAKE_VERSION_MAJOR@ >= 1.1 @PROJECT_PKGCONFIG_REQUIRES@
+Requires: gz-cmake@IGNITION_CMAKE_VERSION_MAJOR@ >= 1.1 @PROJECT_PKGCONFIG_REQUIRES@
 Requires.private: @PROJECT_PKGCONFIG_REQUIRES_PRIVATE@
 Libs: -L${libdir} @project_pkgconfig_core_lib@ @PROJECT_PKGCONFIG_LIBS@
 Libs.private: @PROJECT_PKGCONFIG_LIBS_PRIVATE@

diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
@@ -31,36 +31,36 @@ 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)
+    set(example_tarball_name gz-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 "prerelease")
-    set(example_tarball_name ignition-minimal-1.0.0~pre1.tar.bz2)
+    set(example_tarball_name gz-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)
+    set(example_tarball_name gz-core_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)
+    set(example_tarball_name gz-core_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)
+    set(example_tarball_name gz-core_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)
+    set(example_tarball_name gz-core_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)
+    set(example_tarball_name gz-core_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)
+    set(example_tarball_name gz-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)
+    set(example_tarball_name gz-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)
+    set(example_tarball_name gz-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)
+    set(example_tarball_name gz-use_component_depsc-0.1.0.tar.bz2)
   elseif (${example} STREQUAL "use_config_ifp")
-    set(example_tarball_name  ignition-find_config-0.1.0.tar.bz2)
+    set(example_tarball_name  gz-find_config-0.1.0.tar.bz2)
 
   else()
     set(example_tarball_name)

diff --git a/examples/comp_deps/CMakeLists.txt b/examples/comp_deps/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-component_deps VERSION 0.1.0)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-component_deps VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
 gz_configure_build(QUIT_IF_BUILD_ERRORS
   COMPONENTS child parent)

diff --git a/examples/core_child/CMakeLists.txt b/examples/core_child/CMakeLists.txt
@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-core_child VERSION 0.1.0)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-core_child VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
-gz_find_package(ignition-core_no_deps REQUIRED)
+gz_find_package(gz-core_no_deps REQUIRED)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
-gz_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${IGNITION-CORE_NO_DEPS_API_URL}")
+gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_API_URL}")
diff --git a/examples/core_child/src/CMakeLists.txt b/examples/core_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
-    ignition-core_no_deps::ignition-core_no_deps)
+    gz-core_no_deps::gz-core_no_deps)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/core_child_private/CMakeLists.txt b/examples/core_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)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-core_child_private VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
-gz_find_package(ignition-core_no_deps PRIVATE REQUIRED)
+gz_find_package(gz-core_no_deps PRIVATE REQUIRED)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
-gz_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${IGNITION-CORE_NO_DEPS_API_URL}")
+gz_create_docs(TAGFILES "${GZ-CORE_NO_DEPS_DOXYGEN_TAGFILE} = ${GZ-CORE_NO_DEPS_API_URL}")
diff --git a/examples/core_child_private/src/CMakeLists.txt b/examples/core_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
-    ignition-core_no_deps::ignition-core_no_deps)
+    gz-core_no_deps::gz-core_no_deps)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/core_nodep/CMakeLists.txt b/examples/core_nodep/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-core_no_deps VERSION 0.1.0)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-core_no_deps VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()

diff --git a/examples/core_nodep_static/CMakeLists.txt b/examples/core_nodep_static/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-core_no_deps_static VERSION 0.1.0)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-core_no_deps_static VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
 OPTION(BUILD_SHARED_LIBS OFF)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/core_static_child/CMakeLists.txt b/examples/core_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)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-core_static_child VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
-gz_find_package(ignition-core_no_deps_static REQUIRED)
+gz_find_package(gz-core_no_deps_static REQUIRED)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
 gz_create_packages()
-gz_create_docs(TAGFILES "${IGNITION-CORE_NO_DEPS_STATIC_DOXYGEN_TAGFILE} = ${IGNITION-CORE_NO_DEPS_STATIC_API_URL}")
+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/src/CMakeLists.txt b/examples/core_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
-    ignition-core_no_deps_static::ignition-core_no_deps_static)
+    gz-core_no_deps_static::gz-core_no_deps_static)
 gz_build_tests(TYPE UNIT SOURCES ${gtest_sources})
diff --git a/examples/find_ogre2/ogre-2.1/CMakeLists.txt b/examples/find_ogre2/ogre-2.1/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(ignition-ogre-2.1 VERSION 0.1.0)
 
-find_package(ignition-cmake3 REQUIRED)
+find_package(gz-cmake3 REQUIRED)
 
 message(STATUS "Finding OGRE 2.1")
 

diff --git a/examples/find_ogre2/ogre-2.2/CMakeLists.txt b/examples/find_ogre2/ogre-2.2/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-ogre-2.2 VERSION 0.1.0)
+project(gz-ogre-2.2 VERSION 0.1.0)
 
-find_package(ignition-cmake3 REQUIRED)
+find_package(gz-cmake3 REQUIRED)
 
 message(STATUS "Finding OGRE 2.2")
 

diff --git a/examples/ign_conf/CMakeLists.txt b/examples/ign_conf/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-minimal0 VERSION 0.1.0)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-minimal0 VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
diff --git a/examples/no_ignition_prefix/CMakeLists.txt b/examples/no_ignition_prefix/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
 project(no_ignition_prefix VERSION 0.1.0)
-find_package(ignition-cmake3 REQUIRED)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project(
   NO_IGNITION_PREFIX
   REPLACE_IGNITION_INCLUDE_PATH no_ign)

diff --git a/examples/prerelease/CMakeLists.txt b/examples/prerelease/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-minimal1 VERSION 1.0.0)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-minimal1 VERSION 1.0.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project(VERSION_SUFFIX pre1)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
diff --git a/examples/sanitizers/CMakeLists.txt b/examples/sanitizers/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
-project(ignition-sanitizers VERSION 0.1.0)
-find_package(ignition-cmake3 REQUIRED)
+project(gz-sanitizers VERSION 0.1.0)
+find_package(gz-cmake3 REQUIRED)
 gz_configure_project()
 gz_configure_build(QUIT_IF_BUILD_ERRORS)