From c886d37ad29d056dfd1e21bd3cd99f3b54c71277 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 27 Jun 2022 18:11:41 -0700 Subject: [PATCH] More aggressive migrations for ignition- and ign- Signed-off-by: methylDragon --- CMakeLists.txt | 4 ++-- cmake/IgnUtils.cmake | 16 ++++++++-------- configure.bat | 2 +- include/ignition/utilities/ExtraTestMacros.hh | 2 +- include/ignition/utilities/SuppressWarning.hh | 2 +- test/cmake_minimum_required.bash | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6afe2719..4da10b09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ option(BUILDSYSTEM_TESTING "Enable extended buildsystem testing" FALSE) #-------------------------------------- # Install the ignition documentation files -# Note: This is not actually creating a doc target for ign-cmake; this is just +# Note: This is not actually creating a doc target for gz-cmake; this is just # installing files that are useful for generating the documentation of other # ignition projects. add_subdirectory(doc) @@ -169,7 +169,7 @@ if (BUILD_TESTING AND BUILDSYSTEM_TESTING) #============================================================================ # Build examples #============================================================================ - # Do a fake install of ign-cmake in order to test the examples. + # Do a fake install of gz-cmake in order to test the examples. # Copy or symlink the config.cmake files and cmake folder set(FAKE_BUILD_DIRECTORY "${CMAKE_BINARY_DIR}/fake/build") set(FAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}/fake/install") diff --git a/cmake/IgnUtils.cmake b/cmake/IgnUtils.cmake index 70f18593..dace49ee 100644 --- a/cmake/IgnUtils.cmake +++ b/cmake/IgnUtils.cmake @@ -114,7 +114,7 @@ # 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 # gz_find_package(~). These arguments can also be used to overwrite the -# pkg-config entries that get generated by the ign-cmake find-module for the +# pkg-config entries that get generated by the gz-cmake find-module for the # package. Do not hesitate to ask for help if you need to use these arguments. # # [PKGCONFIG]: Optional. If provided, the string that follows will be used to @@ -358,14 +358,14 @@ macro(gz_find_package PACKAGE_NAME) if(NOT gz_find_package_PKGCONFIG_IGNORE) # Here we will set up the pkgconfig entry for this package. Ordinarily, - # these variables should be set by the ign-cmake custom find-module for + # these variables should be set by the gz-cmake custom find-module for # the package which should use gz_pkg_check_modules[_quiet] or # gz_pkg_config_library_entry. However, that will not be performed by # third-party dependencies that provide their own find-module or their own # cmake config-module. Therefore, we provide the option of specifying # pkgconfig information through the call to gz_find_package. This also # allows callers of gz_find_package(~) to overwrite the default - # pkg-config entry that gets generated by the ign-cmake find-modules. + # pkg-config entry that gets generated by the gz-cmake find-modules. # If the caller has specified the arguments PKGCONFIG_LIB or PKGCONFIG, # then we will overwrite these pkgconfig variables with the information @@ -416,7 +416,7 @@ macro(gz_find_package PACKAGE_NAME) "Could not find pkg-config information for ${PACKAGE_NAME}. " "It was not provided by the find-module for the package, nor was it " "explicitly passed into the call to gz_find_package(~). This is " - "most likely an error in this project's use of ign-cmake.") + "most likely an error in this project's use of gz-cmake.") else() @@ -884,7 +884,7 @@ endmacro(gz_build_warning) # Creates a fatal error if the variable passed in does not represent a supported # version of the C++ standard. # -# NOTE: This function is meant for internal ign-cmake use +# NOTE: This function is meant for internal gz-cmake use # function(_gz_check_known_cxx_standards standard) @@ -905,7 +905,7 @@ endfunction() # Handles the C++ standard argument for gz_create_core_library(~) and # gz_add_component(~). # -# NOTE: This is only meant for internal ign-cmake use. +# NOTE: This is only meant for internal gz-cmake use. # macro(_gz_handle_cxx_standard prefix target pkgconfig_cflags) @@ -1917,7 +1917,7 @@ endmacro() # Set to match the prefix that is given to cmake_parse_arguments(~). # This should also match the name of the function or macro that called it. # -# NOTE: This should only be used by functions inside of ign-cmake specifically. +# NOTE: This should only be used by functions inside of gz-cmake specifically. # Other ignition projects should not use this macro. # macro(_gz_cmake_parse_arguments prefix options oneValueArgs multiValueArgs) @@ -1928,7 +1928,7 @@ macro(_gz_cmake_parse_arguments prefix options oneValueArgs multiValueArgs) # The user passed in some arguments that we don't currently recognize. We'll # emit a warning so they can check whether they're using the correct version - # of ign-cmake. + # of gz-cmake. message(AUTHOR_WARNING "\nThe build script has specified some unrecognized arguments for ${prefix}(~):\n" "${${prefix}_UNPARSED_ARGUMENTS}\n" diff --git a/configure.bat b/configure.bat index 1166d969..6b062700 100644 --- a/configure.bat +++ b/configure.bat @@ -2,7 +2,7 @@ :: NOTE: This script is only meant to be used as part of the ignition developers' CI system :: Users and developers should build and install this library using cmake and Visual Studio -:: ign-cmake has no dependencies +:: gz-cmake has no dependencies :: Go to the directory that this file configure.bat file exists in cd /d %~dp0 diff --git a/include/ignition/utilities/ExtraTestMacros.hh b/include/ignition/utilities/ExtraTestMacros.hh index 757a32cf..c5fd57e9 100644 --- a/include/ignition/utilities/ExtraTestMacros.hh +++ b/include/ignition/utilities/ExtraTestMacros.hh @@ -20,7 +20,7 @@ #include -#pragma message("ign-cmake (utilities) ExtraTestMacros is deprecated, use ign-utils") +#pragma message("gz-cmake (utilities) ExtraTestMacros is deprecated, use gz-utils") /// \brief Restrict the execution of the test for the Windows platform. /// The test will be compiled on Windows too but will never be run as diff --git a/include/ignition/utilities/SuppressWarning.hh b/include/ignition/utilities/SuppressWarning.hh index 62cc4681..1ccf9e00 100644 --- a/include/ignition/utilities/SuppressWarning.hh +++ b/include/ignition/utilities/SuppressWarning.hh @@ -20,7 +20,7 @@ #include -#pragma message("ign-cmake (utilities) SuppressWarning is deprecated, use ign-utils") +#pragma message("gz-cmake (utilities) SuppressWarning is deprecated, use gz-utils") // This header contains cross-platform macros for suppressing warnings. Please // only use these macros responsibly when you are certain that the compiler is diff --git a/test/cmake_minimum_required.bash b/test/cmake_minimum_required.bash index f8675525..ba16505b 100755 --- a/test/cmake_minimum_required.bash +++ b/test/cmake_minimum_required.bash @@ -8,14 +8,14 @@ export CMAKE_FILES_TO_CHECK=" $1/cmake/ignition-config.cmake.in $1/config/ignition-cmake-config.cmake.in" unset TEST_CMAKE_MIN_REQUIRED_FAILED -# first argument is root of ign-cmake repository +# first argument is root of gz-cmake repository if [[ ! -d "$1" \ || ! -a "$1/CMakeLists.txt" \ || ! -a "$1/cmake/ignition-all-config.cmake.in" \ || ! -a "$1/cmake/ignition-component-config.cmake.in" \ || ! -a "$1/cmake/ignition-config.cmake.in" \ || ! -a "$1/config/ignition-cmake-config.cmake.in" ]]; then - echo the first argument must be the root of the ign-cmake repository + echo the first argument must be the root of the gz-cmake repository export TEST_CMAKE_MIN_REQUIRED_FAILED=1 else grep -h '^cmake_minimum_required' $CMAKE_FILES_TO_CHECK \