Skip to content

Commit

Permalink
More aggressive migrations for ignition- and ign-
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <methylDragon@gmail.com>
  • Loading branch information
methylDragon committed Jun 28, 2022
1 parent 7d4dfdf commit c886d37
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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")
Expand Down
16 changes: 8 additions & 8 deletions cmake/IgnUtils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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()

Expand Down Expand Up @@ -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)

Expand All @@ -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)

Expand Down Expand Up @@ -1917,7 +1917,7 @@ endmacro()
# Set <prefix> 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)
Expand All @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/utilities/ExtraTestMacros.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <ignition/utilities/detail/ExtraTestMacros.hh>

#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
Expand Down
2 changes: 1 addition & 1 deletion include/ignition/utilities/SuppressWarning.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <ignition/utilities/detail/SuppressWarning.hh>

#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
Expand Down
4 changes: 2 additions & 2 deletions test/cmake_minimum_required.bash
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down

0 comments on commit c886d37

Please sign in to comment.