From f38789bb61fbcb7f2813cd6193c8ff2cc9ec137b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Ag=C3=BCero?= Date: Tue, 19 Nov 2024 22:45:12 +0100 Subject: [PATCH] Bump main to gz-cmake 5.0.0~pre1 (#462) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Carlos Agüero --- CMakeLists.txt | 4 ++-- Changelog.md | 4 ++++ MigrationFromClassic.md | 2 +- examples/comp_deps/CMakeLists.txt | 2 +- examples/core_child/CMakeLists.txt | 2 +- examples/core_child_private/CMakeLists.txt | 2 +- examples/core_nodep/CMakeLists.txt | 2 +- examples/core_nodep_static/CMakeLists.txt | 2 +- examples/core_static_child/CMakeLists.txt | 2 +- examples/find_ogre2/ogre-2.1/CMakeLists.txt | 2 +- examples/find_ogre2/ogre-2.2/CMakeLists.txt | 2 +- examples/find_ogre2/ogre-2.3/CMakeLists.txt | 2 +- examples/find_ogre2/ogre-2/CMakeLists.txt | 2 +- examples/find_ogre2/ogre/CMakeLists.txt | 2 +- examples/gz_conf/CMakeLists.txt | 2 +- examples/no_gz_prefix/CMakeLists.txt | 2 +- examples/prerelease/CMakeLists.txt | 2 +- examples/sanitizers/CMakeLists.txt | 2 +- examples/use_component_depsA/CMakeLists.txt | 2 +- examples/use_component_depsB/CMakeLists.txt | 2 +- examples/use_component_depsC/CMakeLists.txt | 2 +- examples/use_config_ifp/CMakeLists.txt | 2 +- package.xml | 4 ++-- 23 files changed, 28 insertions(+), 24 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc0e27ba..06218e1d 100644 --- 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 index edba78a6..9f5728db 100644 --- 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 index 8e650b12..7ca20eb1 100644 --- 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 index 563e3b18..320767d6 100644 --- 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 index 2b758e30..7c7e896f 100644 --- 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 index 72d12928..64e8ded6 100644 --- 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 index f7ed3a5d..136b41c2 100644 --- 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 index 27f29d58..080a1154 100644 --- 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 index dbe6c8d0..253bbbe2 100644 --- 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 index 91537966..bbc009b8 100644 --- 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 index 20f8b114..34b4bc6a 100644 --- 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 index 78f6307d..7e6ebca6 100644 --- 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 index 8a9f8857..1b2dc97e 100644 --- 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 index 8fe73fca..ae438063 100644 --- 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 index 31de84a1..80fc212b 100644 --- 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 index 1696ac75..47b81e10 100644 --- 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 index ba1ac744..c97cf789 100644 --- 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 index bfb02883..a8324852 100644 --- 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 index 02f9e164..153ca61e 100644 --- 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 index cebcdf8f..fea666d6 100644 --- 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 index bc6f1755..87cc9483 100644 --- 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 index 0a312098..abbe4bd2 100644 --- 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 index e7018a76..16a6b27c 100644 --- a/package.xml +++ b/package.xml @@ -1,8 +1,8 @@ - gz-cmake4 - 4.0.0 + gz-cmake5 + 5.0.0 Gazebo CMake : CMake Modules for Gazebo Projects Steve Peters