Bump main to gz-cmake 5.0.0~pre1 (#462)

Signed-off-by: Carlos Agüero <caguero@openrobotics.org>
gazebosim · Nov 19, 2024 · f38789b · f38789b
1 parent 3142f25
commit f38789b
Show file tree

Hide file tree

Showing 23 changed files with 28 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 #============================================================================
 # Initialize the project
 #============================================================================
-project(gz-cmake4 VERSION 4.0.0)
+project(gz-cmake5 VERSION 5.0.0)
 
 #--------------------------------------
 # Initialize the GZ_CMAKE_DIR variable with the location of the cmake
@@ -20,7 +20,7 @@ include(GzCMake)
 
 #--------------------------------------
 # Set up the project
-gz_configure_project(VERSION_SUFFIX)
+gz_configure_project(VERSION_SUFFIX pre1)
 
 #--------------------------------------
 # Set project-specific options

diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,7 @@
+## Gazebo CMake 5.x
+
+### Gazebo CMake 5.0.0 (202X-XX-XX)
+
 ## Gazebo CMake 4.x
 
 ### Gazebo CMake 4.0.0 (2024-09-25)

diff --git a/MigrationFromClassic.md b/MigrationFromClassic.md
@@ -30,7 +30,7 @@ That's right, just throw it all out.
 We're migrating to 3.22 because it provides many valuable features that we are
 now taking advantage of.
 
-### Then call `find_package(gz-cmake4 REQUIRED)`
+### Then call `find_package(gz-cmake5 REQUIRED)`
 
 This will find `gz-cmake` and load up all its useful features for you.
 

diff --git a/examples/comp_deps/CMakeLists.txt b/examples/comp_deps/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-component_deps VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project(
   REPLACE_INCLUDE_PATH gz/component_deps
 )

diff --git a/examples/core_child/CMakeLists.txt b/examples/core_child/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-core_child VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-core_no_deps REQUIRED EXTRA_ARGS NAMES gz-core_no_deps)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/core_child_private/CMakeLists.txt b/examples/core_child_private/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-core_child_private VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-core_no_deps PRIVATE REQUIRED)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/core_nodep/CMakeLists.txt b/examples/core_nodep/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-core_no_deps VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project(
   REPLACE_INCLUDE_PATH gz/core_no_deps
 )

diff --git a/examples/core_nodep_static/CMakeLists.txt b/examples/core_nodep_static/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-core_no_deps_static VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project(
   REPLACE_INCLUDE_PATH gz/core_no_deps_static
 )

diff --git a/examples/core_static_child/CMakeLists.txt b/examples/core_static_child/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-core_static_child VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-core_no_deps_static REQUIRED)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/find_ogre2/ogre-2.1/CMakeLists.txt b/examples/find_ogre2/ogre-2.1/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-ogre-2.1 VERSION 0.1.0)
 
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 
 message(STATUS "Finding OGRE 2.1")
 

diff --git a/examples/find_ogre2/ogre-2.2/CMakeLists.txt b/examples/find_ogre2/ogre-2.2/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-ogre-2.2 VERSION 0.1.0)
 
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 
 message(STATUS "Finding OGRE 2.2.0")
 gz_find_package(GzOGRE2 VERSION 2.2.0

diff --git a/examples/find_ogre2/ogre-2.3/CMakeLists.txt b/examples/find_ogre2/ogre-2.3/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-ogre-2.3 VERSION 0.1.0)
 
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 
 message(STATUS "Finding OGRE 2.3.0")
 gz_find_package(GzOGRE2 VERSION 2.3.0

diff --git a/examples/find_ogre2/ogre-2/CMakeLists.txt b/examples/find_ogre2/ogre-2/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-ogre-2 VERSION 0.1.0)
 
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 
 message(STATUS "Finding OGRE 2")
 gz_find_package(GzOGRE2 VERSION 2

diff --git a/examples/find_ogre2/ogre/CMakeLists.txt b/examples/find_ogre2/ogre/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-ogre VERSION 0.1.0)
 
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 
 message(STATUS "Finding OGRE 2")
 gz_find_package(GzOGRE2

diff --git a/examples/gz_conf/CMakeLists.txt b/examples/gz_conf/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-minimal0 VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
diff --git a/examples/no_gz_prefix/CMakeLists.txt b/examples/no_gz_prefix/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(no_gz_prefix VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project(
   NO_PROJECT_PREFIX
   REPLACE_INCLUDE_PATH no_gz)

diff --git a/examples/prerelease/CMakeLists.txt b/examples/prerelease/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-minimal1 VERSION 1.0.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project(VERSION_SUFFIX pre1)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
diff --git a/examples/sanitizers/CMakeLists.txt b/examples/sanitizers/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-sanitizers VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_configure_build(QUIT_IF_BUILD_ERRORS)
diff --git a/examples/use_component_depsA/CMakeLists.txt b/examples/use_component_depsA/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-use_component_depsA VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-component_deps REQUIRED COMPONENTS parent child)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/use_component_depsB/CMakeLists.txt b/examples/use_component_depsB/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-use_component_depsB VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-component_deps REQUIRED COMPONENTS child parent)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/use_component_depsC/CMakeLists.txt b/examples/use_component_depsC/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-use_component_depsC VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 gz_configure_project()
 gz_find_package(gz-component_deps REQUIRED COMPONENTS child)
 gz_configure_build(QUIT_IF_BUILD_ERRORS)

diff --git a/examples/use_config_ifp/CMakeLists.txt b/examples/use_config_ifp/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.22.1 FATAL_ERROR)
 project(gz-find_config VERSION 0.1.0)
-find_package(gz-cmake4 REQUIRED)
+find_package(gz-cmake5 REQUIRED)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/")
 set(gz-find_config_DIR "${CMAKE_SOURCE_DIR}/")
 #gz_find_package(gz-find_config) will search for Findgz-find_config.cmake before gz-find_configConfig.cmake

diff --git a/package.xml b/package.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <?xml-model href="http://download.ros.org/schema/package_format2.xsd" schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="2">
-  <name>gz-cmake4</name>
-  <version>4.0.0</version>
+  <name>gz-cmake5</name>
+  <version>5.0.0</version>
   <description>Gazebo CMake : CMake Modules for Gazebo Projects</description>
 
   <maintainer email="scpeters@openrobotics.org">Steve Peters</maintainer>