diff --git a/BUILD.bazel b/BUILD.bazel index ff4b5fe..ea33c02 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -3,8 +3,8 @@ load( "IGNITION_FEATURES", "IGNITION_VISIBILITY", "generate_include_header", - "ign_config_header", - "ign_export_header", + "gz_config_header", + "gz_export_header", ) package( @@ -24,7 +24,7 @@ PROJECT_MINOR = 0 PROJECT_PATCH = 0 -ign_config_header( +gz_config_header( name = "config", src = "include/ignition/utils/config.hh.in", cmakelists = ["CMakeLists.txt"], @@ -32,7 +32,7 @@ ign_config_header( project_version = (PROJECT_MAJOR, PROJECT_MINOR, PROJECT_PATCH), ) -ign_export_header( +gz_export_header( name = "include/ignition/utils/Export.hh", export_base = "IGNITION_UTILS", lib_name = "ignition-utils", diff --git a/CMakeLists.txt b/CMakeLists.txt index 321860a..c948401 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,7 +15,7 @@ find_package(ignition-cmake3 REQUIRED) # Configure the project #============================================================================ set(c++standard 17) -ign_configure_project( +gz_configure_project( REPLACE_IGNITION_INCLUDE_PATH gz/utils VERSION_SUFFIX pre1) @@ -35,19 +35,19 @@ option( if(NOT IGN_UTILS_VENDOR_CLI11) # PKGCONFIG_IGNORE can be removed once pkg-config support in CLI11 (see # https://github.com/CLIUtils/CLI11/pull/523) is released - ign_find_package(CLI11 REQUIRED_BY cli PKGCONFIG_IGNORE) + gz_find_package(CLI11 REQUIRED_BY cli PKGCONFIG_IGNORE) endif() #============================================================================ # Configure the build #============================================================================ -ign_configure_build(QUIT_IF_BUILD_ERRORS +gz_configure_build(QUIT_IF_BUILD_ERRORS COMPONENTS cli) #============================================================================ # Create package information #============================================================================ -ign_create_packages() +gz_create_packages() #============================================================================ # Configure documentation @@ -55,6 +55,6 @@ ign_create_packages() configure_file(${CMAKE_SOURCE_DIR}/api.md.in ${CMAKE_BINARY_DIR}/api.md) configure_file(${CMAKE_SOURCE_DIR}/tutorials.md.in ${CMAKE_BINARY_DIR}/tutorials.md) -ign_create_docs( +gz_create_docs( API_MAINPAGE_MD "${CMAKE_BINARY_DIR}/api.md" TUTORIALS_MAINPAGE_MD "${CMAKE_BINARY_DIR}/tutorials.md") diff --git a/cli/include/CMakeLists.txt b/cli/include/CMakeLists.txt index f554110..39d4670 100644 --- a/cli/include/CMakeLists.txt +++ b/cli/include/CMakeLists.txt @@ -2,7 +2,7 @@ # to support the vendored and not vendored case, we need to manually call # add_subdirectory of the correct directory, and # target_include_directories(@tgt@ INTERFACE "$") -# that for the usual include directories are handled by ign_add_component +# that for the usual include directories are handled by gz_add_component if(IGN_UTILS_VENDOR_CLI11) add_subdirectory(vendored-cli) target_include_directories(${gz_utils_cli_target_name} diff --git a/cli/include/external-cli/gz/utils/CMakeLists.txt b/cli/include/external-cli/gz/utils/CMakeLists.txt index 12c13b8..60c0075 100644 --- a/cli/include/external-cli/gz/utils/CMakeLists.txt +++ b/cli/include/external-cli/gz/utils/CMakeLists.txt @@ -1 +1 @@ -ign_install_all_headers(COMPONENT cli) +gz_install_all_headers(COMPONENT cli) diff --git a/cli/include/gz/utils/CMakeLists.txt b/cli/include/gz/utils/CMakeLists.txt index 12c13b8..60c0075 100644 --- a/cli/include/gz/utils/CMakeLists.txt +++ b/cli/include/gz/utils/CMakeLists.txt @@ -1 +1 @@ -ign_install_all_headers(COMPONENT cli) +gz_install_all_headers(COMPONENT cli) diff --git a/cli/include/vendored-cli/gz/utils/CMakeLists.txt b/cli/include/vendored-cli/gz/utils/CMakeLists.txt index 12c13b8..60c0075 100644 --- a/cli/include/vendored-cli/gz/utils/CMakeLists.txt +++ b/cli/include/vendored-cli/gz/utils/CMakeLists.txt @@ -1 +1 @@ -ign_install_all_headers(COMPONENT cli) +gz_install_all_headers(COMPONENT cli) diff --git a/cli/src/CMakeLists.txt b/cli/src/CMakeLists.txt index 14bc66f..0cf4d41 100644 --- a/cli/src/CMakeLists.txt +++ b/cli/src/CMakeLists.txt @@ -1,6 +1,6 @@ -ign_add_component( - cli - INTERFACE +gz_add_component( + cli + INTERFACE INDEPENDENT_FROM_PROJECT_LIB GET_TARGET_NAME gz_utils_cli_target_name) @@ -8,10 +8,10 @@ ign_add_component( set(gz_utils_cli_target_name ${gz_utils_cli_target_name} PARENT_SCOPE) if(NOT IGN_UTILS_VENDOR_CLI11) target_link_libraries(${gz_utils_cli_target_name} INTERFACE CLI11::CLI11) -endif() +endif() -ign_get_libsources_and_unittests(sources gtest_sources) -ign_build_tests(TYPE UNIT +gz_get_libsources_and_unittests(sources gtest_sources) +gz_build_tests(TYPE UNIT SOURCES ${gtest_sources} LIB_DEPS ${gz_utils_cli_target_name} diff --git a/include/gz/utils/CMakeLists.txt b/include/gz/utils/CMakeLists.txt index 439642e..bf4411e 100644 --- a/include/gz/utils/CMakeLists.txt +++ b/include/gz/utils/CMakeLists.txt @@ -1 +1 @@ -ign_install_all_headers() +gz_install_all_headers() diff --git a/include/gz/utils/utils.hh.in b/include/gz/utils/utils.hh.in index 5964169..9f040bf 100644 --- a/include/gz/utils/utils.hh.in +++ b/include/gz/utils/utils.hh.in @@ -1,3 +1,3 @@ // Automatically generated #include -${ign_headers} +${gz_headers} diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9e71b65..94162e3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -ign_get_libsources_and_unittests(sources gtest_sources) +gz_get_libsources_and_unittests(sources gtest_sources) -ign_create_core_library(SOURCES ${sources} CXX_STANDARD ${c++standard}) -ign_build_tests(TYPE UNIT SOURCES ${gtest_sources}) +gz_create_core_library(SOURCES ${sources} CXX_STANDARD ${c++standard}) +gz_build_tests(TYPE UNIT SOURCES ${gtest_sources}) diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index a6c95bf..2795209 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -1,6 +1,6 @@ set(TEST_TYPE "INTEGRATION") -ign_get_sources(tests) +gz_get_sources(tests) # Test symbols having the right name on linux only if (UNIX AND NOT APPLE) @@ -9,6 +9,6 @@ if (UNIX AND NOT APPLE) COMMAND bash ${CMAKE_CURRENT_BINARY_DIR}/all_symbols_have_version.bash $) endif() -ign_build_tests(TYPE INTEGRATION SOURCES ${tests}) +gz_build_tests(TYPE INTEGRATION SOURCES ${tests}) add_subdirectory(implptr) diff --git a/test/integration/implptr/CMakeLists.txt b/test/integration/implptr/CMakeLists.txt index 33751a2..bd79bd2 100644 --- a/test/integration/implptr/CMakeLists.txt +++ b/test/integration/implptr/CMakeLists.txt @@ -11,7 +11,7 @@ target_compile_definitions( -Dignition_utils${PROJECT_VERSION_MAJOR}_EXPORTS ) -ign_build_tests(TYPE INTEGRATION SOURCES ImplPtr_TEST.cc) +gz_build_tests(TYPE INTEGRATION SOURCES ImplPtr_TEST.cc) target_link_libraries(INTEGRATION_ImplPtr_TEST implptr_test_classes diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt index 7cf00db..854be5c 100644 --- a/test/performance/CMakeLists.txt +++ b/test/performance/CMakeLists.txt @@ -5,4 +5,4 @@ set(tests link_directories(${PROJECT_BINARY_DIR}/test) -ign_build_tests(TYPE PERFORMANCE SOURCES ${tests}) +gz_build_tests(TYPE PERFORMANCE SOURCES ${tests}) diff --git a/test/regression/CMakeLists.txt b/test/regression/CMakeLists.txt index ebbc7da..aac9ecd 100644 --- a/test/regression/CMakeLists.txt +++ b/test/regression/CMakeLists.txt @@ -5,4 +5,4 @@ set(tests link_directories(${PROJECT_BINARY_DIR}/test) -ign_build_tests(TYPE REGRESSION SOURCES ${tests}) +gz_build_tests(TYPE REGRESSION SOURCES ${tests})