diff --git a/CMakeLists.txt b/CMakeLists.txt index 92b9d39a..c241de98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,7 +14,7 @@ set(IGN_CMAKE_VER ${ignition-cmake3_VERSION_MAJOR}) #============================================================================ # Configure the project #============================================================================ -ign_configure_project( +gz_configure_project( REPLACE_IGNITION_INCLUDE_PATH gz/launch VERSION_SUFFIX) @@ -31,49 +31,49 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") #-------------------------------------- # Find Tinyxml2 -ign_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2) +gz_find_package(TINYXML2 REQUIRED PRIVATE PRETTY tinyxml2) #-------------------------------------- # Find ignition-common -ign_find_package(ignition-common5 REQUIRED PRIVATE) +gz_find_package(ignition-common5 REQUIRED PRIVATE) set(IGN_COMMON_MAJOR_VER ${ignition-common5_VERSION_MAJOR}) #-------------------------------------- # Find ignition-utils -ign_find_package(ignition-utils2 REQUIRED COMPONENTS cli) +gz_find_package(ignition-utils2 REQUIRED COMPONENTS cli) set(IGN_UTILS_VER ${ignition-utils2_VERSION_MAJOR}) #-------------------------------------- # Find ignition-plugin -ign_find_package(ignition-plugin2 REQUIRED_BY launch COMPONENTS loader register) +gz_find_package(ignition-plugin2 REQUIRED_BY launch COMPONENTS loader register) set(IGN_PLUGIN_MAJOR_VER ${ignition-plugin2_VERSION_MAJOR}) #-------------------------------------- # Find ignition-tools -ign_find_package(ignition-tools2 +gz_find_package(ignition-tools2 REQUIRED PKGCONFIG "ignition-tools") #-------------------------------------- # Find ignition-transport -ign_find_package(ignition-transport12 REQUIRED) +gz_find_package(ignition-transport12 REQUIRED) set(IGN_TRANSPORT_MAJOR_VER ${ignition-transport12_VERSION_MAJOR}) #-------------------------------------- # Find ignition-msgs -ign_find_package(ignition-msgs9 REQUIRED) +gz_find_package(ignition-msgs9 REQUIRED) set(IGN_MSGS_MAJOR_VER ${ignition-msgs9_VERSION_MAJOR}) #-------------------------------------- # Find ignition-math -ign_find_package(ignition-math7 REQUIRED) +gz_find_package(ignition-math7 REQUIRED) set(IGN_MATH_MAJOR_VER ${ignition-math7_VERSION_MAJOR}) #-------------------------------------- # Find ignition-gui -ign_find_package(ignition-gui7 REQUIRED) +gz_find_package(ignition-gui7 REQUIRED) set(IGN_GUI_MAJOR_VER ${ignition-gui7_VERSION_MAJOR}) -ign_find_package (Qt5 +gz_find_package (Qt5 COMPONENTS Core Quick @@ -83,12 +83,12 @@ ign_find_package (Qt5 #-------------------------------------- # Find ignition-gazebo -ign_find_package(ignition-gazebo7 REQUIRED PRIVATE COMPONENTS gui) +gz_find_package(ignition-gazebo7 REQUIRED PRIVATE COMPONENTS gui) set(IGN_GAZEBO_MAJOR_VER ${ignition-gazebo7_VERSION_MAJOR}) -ign_pkg_check_modules(websockets libwebsockets) +gz_pkg_check_modules(websockets libwebsockets) if (NOT websockets_FOUND) - ign_build_warning("Unable to find libwebsockets. The websocket_server plugin will not be built.") + gz_build_warning("Unable to find libwebsockets. The websocket_server plugin will not be built.") endif() #-------------------------------------- @@ -103,7 +103,7 @@ add_subdirectory(plugins) #============================================================================ # Configure the build #============================================================================ -ign_configure_build(QUIT_IF_BUILD_ERRORS) +gz_configure_build(QUIT_IF_BUILD_ERRORS) #============================================================================ # install example .ign files @@ -113,7 +113,7 @@ add_subdirectory(examples) #============================================================================ # Create package information #============================================================================ -ign_create_packages() +gz_create_packages() #============================================================================ # Configure documentation @@ -121,7 +121,7 @@ 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" TAGFILES diff --git a/include/gz/launch/CMakeLists.txt b/include/gz/launch/CMakeLists.txt index 439642e6..bf4411e8 100644 --- a/include/gz/launch/CMakeLists.txt +++ b/include/gz/launch/CMakeLists.txt @@ -1 +1 @@ -ign_install_all_headers() +gz_install_all_headers() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 79180720..792971cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -9,7 +9,7 @@ set (gtest_sources ) # Create the library target. -ign_create_core_library(SOURCES ${sources} CXX_STANDARD 17) +gz_create_core_library(SOURCES ${sources} CXX_STANDARD 17) # Link the libraries that we always need. target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} @@ -26,7 +26,7 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} target_compile_definitions(${PROJECT_LIBRARY_TARGET_NAME} PRIVATE ${BACKWARD_DEFINITIONS}) # Build the unit tests. -ign_build_tests(TYPE UNIT SOURCES ${gtest_sources} +gz_build_tests(TYPE UNIT SOURCES ${gtest_sources} EXCLUDE_PROJECT_LIB LIB_DEPS ${PROJECT_LIBRARY_TARGET_NAME} diff --git a/src/cmd/CMakeLists.txt b/src/cmd/CMakeLists.txt index 30cadc32..7a7aed60 100644 --- a/src/cmd/CMakeLists.txt +++ b/src/cmd/CMakeLists.txt @@ -1,6 +1,6 @@ # Collect source files into the "sources" variable and unit test files into the # "gtest_sources" variable. -ign_get_libsources_and_unittests(sources gtest_sources) +gz_get_libsources_and_unittests(sources gtest_sources) add_library(ign STATIC ign.cc) target_include_directories(ign PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) @@ -25,7 +25,7 @@ install( ) # Build the unit tests. -ign_build_tests(TYPE UNIT SOURCES ${gtest_sources} +gz_build_tests(TYPE UNIT SOURCES ${gtest_sources} TEST_LIST test_list LIB_DEPS ${EXTRA_TEST_LIB_DEPS}) @@ -94,7 +94,7 @@ file(GENERATE OUTPUT "${cmd_script_generated}" INPUT "${cmd_script_configured}") -set(ign_library_path "${CMAKE_BINARY_DIR}/test/lib/$/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") +set(gz_library_path "${CMAKE_BINARY_DIR}/test/lib/$/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") # Generate a configuration file for internal testing. # Note that the major version of the library is included in the name. @@ -108,7 +108,7 @@ file(GENERATE INPUT "${CMAKE_CURRENT_BINARY_DIR}/${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}.yaml.configured") # Used for the installed version. -set(ign_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") +set(gz_library_path "${CMAKE_INSTALL_PREFIX}/lib/ruby/ignition/cmd${IGN_DESIGNATION}${PROJECT_VERSION_MAJOR}") # Generate the configuration file that is installed. # Note that the major version of the library is included in the name. diff --git a/src/cmd/launch.yaml.in b/src/cmd/launch.yaml.in index 60958215..c1c86c43 100644 --- a/src/cmd/launch.yaml.in +++ b/src/cmd/launch.yaml.in @@ -2,7 +2,7 @@ format: 1.0.0 library_name: @PROJECT_NAME_NO_VERSION@ library_version: @PROJECT_VERSION_FULL@ -library_path: @ign_library_path@ +library_path: @gz_library_path@ commands: - launch: Run and manage executables and plugins. --- diff --git a/test/integration/CMakeLists.txt b/test/integration/CMakeLists.txt index 8284bfea..1c6496c6 100644 --- a/test/integration/CMakeLists.txt +++ b/test/integration/CMakeLists.txt @@ -10,7 +10,7 @@ if(NOT WIN32) # Disable test on Windows, it deals with UNIX signals set(tests faulty_plugins.cc) - ign_build_tests(TYPE INTEGRATION SOURCES ${tests} TEST_LIST test_targets) + gz_build_tests(TYPE INTEGRATION SOURCES ${tests} TEST_LIST test_targets) foreach(test ${test_targets}) target_compile_definitions(${test} PRIVATE "bad_plugins_LIB=\"$\"") diff --git a/test/performance/CMakeLists.txt b/test/performance/CMakeLists.txt index 00083709..a73bfddb 100644 --- a/test/performance/CMakeLists.txt +++ b/test/performance/CMakeLists.txt @@ -4,4 +4,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 ebbc7da6..aac9ecda 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})