From 7d522e66402b405bd418e409f129fe8753e99d4c Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 27 Jul 2023 21:10:14 -0700 Subject: [PATCH 1/2] Remove ignition Signed-off-by: Nate Koenig --- NEWS | 2 +- graphics/src/AssimpLoader.cc | 2 +- src/Filesystem_TEST.cc | 4 ++-- tutorials/profiler.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NEWS b/NEWS index 6b7be6e12..a73d9b7c1 100644 --- a/NEWS +++ b/NEWS @@ -1 +1 @@ -http://ignition_robotics.org +http://gazebosim.org diff --git a/graphics/src/AssimpLoader.cc b/graphics/src/AssimpLoader.cc index 4dd01de0a..10450b1cd 100644 --- a/graphics/src/AssimpLoader.cc +++ b/graphics/src/AssimpLoader.cc @@ -55,7 +55,7 @@ class AssimpLoader::Implementation /// \brief the Assimp importer used to parse meshes public: Assimp::Importer importer; - /// \brief Convert a color from assimp implementation to Ignition common + /// \brief Convert a color from assimp implementation to Gazebo common /// \param[in] _color the assimp color to convert /// \return the matching math::Color public: math::Color ConvertColor(aiColor4D& _color) const; diff --git a/src/Filesystem_TEST.cc b/src/Filesystem_TEST.cc index 86a72c8ad..dad616fa4 100644 --- a/src/Filesystem_TEST.cc +++ b/src/Filesystem_TEST.cc @@ -357,8 +357,8 @@ TEST_F(FilesystemTest, append) #endif // Make sure that the slashes in the middle of string are not altered. - path = joinPaths("https://fuel.ignitionrobotics.org", "/models", "box"); - EXPECT_EQ(path, "https://fuel.ignitionrobotics.org/models/box"); + path = joinPaths("https://fuel.gazebosim.org", "/models", "box"); + EXPECT_EQ(path, "https://fuel.gazebosim.org/models/box"); } ///////////////////////////////////////////////// diff --git a/tutorials/profiler.md b/tutorials/profiler.md index 65498ddad..cf89ebb38 100644 --- a/tutorials/profiler.md +++ b/tutorials/profiler.md @@ -63,7 +63,7 @@ cmake_minimum_required(VERSION 2.8 FATAL_ERROR) find_package(gz-common6 QUIET REQUIRED COMPONENTS profiler) add_executable(profiler_example profiler.cc) -target_link_libraries(profiler_example ignition-common6::profiler) +target_link_libraries(profiler_example gz-common6::profiler) # Enable the profiler for the example target_compile_definitions(profiler_example PUBLIC "GZ_PROFILER_ENABLE=1") ``` From 4251d2f903054f82e88321ff83bc43bc127d09fc Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Thu, 27 Jul 2023 21:33:09 -0700 Subject: [PATCH 2/2] version bumps Signed-off-by: Nate Koenig --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 782c6224c..34ca6ab05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,8 @@ set(GZ_COMMON_VER ${PROJECT_VERSION_MAJOR}) #============================================================================ # Find gz-cmake #============================================================================ -find_package(gz-cmake3 REQUIRED) -set(GZ_CMAKE_VER ${gz-cmake3_VERSION_MAJOR}) +find_package(gz-cmake4 REQUIRED) +set(GZ_CMAKE_VER ${gz-cmake4_VERSION_MAJOR}) #============================================================================ # Configure the project @@ -49,13 +49,13 @@ message(STATUS "\n\n-- ====== Finding Dependencies ======") #-------------------------------------- # Find gz-math -gz_find_package(gz-math7 REQUIRED_BY geospatial graphics events) -set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR}) +gz_find_package(gz-math8 REQUIRED_BY geospatial graphics events) +set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR}) #-------------------------------------- # Find gz-utils -gz_find_package(gz-utils2 REQUIRED) -set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR}) +gz_find_package(gz-utils3 REQUIRED) +set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR}) #-------------------------------------- # Find Tinyxml2