From 81f0996525cfb1b95107a2a45cf05cd3fc96f334 Mon Sep 17 00:00:00 2001 From: Louise Poubel Date: Tue, 2 Aug 2022 13:51:24 -0700 Subject: [PATCH] Bump main to 4.0.0~pre1 Signed-off-by: Louise Poubel --- CMakeLists.txt | 2 +- Changelog.md | 7 +++++++ 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/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 +- 16 files changed, 22 insertions(+), 15 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5a4f3abc..c9ef3ecf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) #============================================================================ # Initialize the project #============================================================================ -project(gz-cmake3 VERSION 3.0.0) +project(gz-cmake4 VERSION 4.0.0) #-------------------------------------- # Initialize the GZ_CMAKE_DIR variable with the location of the cmake diff --git a/Changelog.md b/Changelog.md index 6f62d584..3df94696 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,10 @@ +## Gazebo CMake 4.x + + + +## Gazebo CMake 3.x + + ## Gazebo CMake 2.x ### Gazebo CMake 2.14.0 (2022-07-25) diff --git a/examples/comp_deps/CMakeLists.txt b/examples/comp_deps/CMakeLists.txt index 16a74806..096a1480 100644 --- a/examples/comp_deps/CMakeLists.txt +++ b/examples/comp_deps/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-component_deps VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 7ef23995..6a710cde 100644 --- a/examples/core_child/CMakeLists.txt +++ b/examples/core_child/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-core_child VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 REQUIRED) gz_configure_project() gz_find_package(gz-core_no_deps REQUIRED) gz_configure_build(QUIT_IF_BUILD_ERRORS) diff --git a/examples/core_child_private/CMakeLists.txt b/examples/core_child_private/CMakeLists.txt index f9c0a92c..5074b893 100644 --- a/examples/core_child_private/CMakeLists.txt +++ b/examples/core_child_private/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-core_child_private VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 2bce192a..54c9fba6 100644 --- a/examples/core_nodep/CMakeLists.txt +++ b/examples/core_nodep/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-core_no_deps VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 bb25b1a4..ca85e4fc 100644 --- a/examples/core_nodep_static/CMakeLists.txt +++ b/examples/core_nodep_static/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-core_no_deps_static VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 811e9c53..6e83c7c1 100644 --- a/examples/core_static_child/CMakeLists.txt +++ b/examples/core_static_child/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-core_static_child VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 REQUIRED) gz_configure_project() gz_find_package(gz-core_no_deps_static REQUIRED) gz_configure_build(QUIT_IF_BUILD_ERRORS) diff --git a/examples/gz_conf/CMakeLists.txt b/examples/gz_conf/CMakeLists.txt index 3d3c3d2c..1f76cf0a 100644 --- a/examples/gz_conf/CMakeLists.txt +++ b/examples/gz_conf/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-minimal0 VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 fe5c4907..63d4a30c 100644 --- a/examples/no_gz_prefix/CMakeLists.txt +++ b/examples/no_gz_prefix/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(no_gz_prefix VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 a1ebbb24..081a399c 100644 --- a/examples/prerelease/CMakeLists.txt +++ b/examples/prerelease/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-minimal1 VERSION 1.0.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 bf5741a7..5971cc44 100644 --- a/examples/sanitizers/CMakeLists.txt +++ b/examples/sanitizers/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-sanitizers VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 874f36b1..f8783e6e 100644 --- a/examples/use_component_depsA/CMakeLists.txt +++ b/examples/use_component_depsA/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-use_component_depsA VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 d80427ca..d50fd020 100644 --- a/examples/use_component_depsB/CMakeLists.txt +++ b/examples/use_component_depsB/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-use_component_depsB VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 72d7d7af..e94f9ead 100644 --- a/examples/use_component_depsC/CMakeLists.txt +++ b/examples/use_component_depsC/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-use_component_depsC VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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 faaa75d2..28232d96 100644 --- a/examples/use_config_ifp/CMakeLists.txt +++ b/examples/use_config_ifp/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR) project(gz-find_config VERSION 0.1.0) -find_package(gz-cmake3 REQUIRED) +find_package(gz-cmake4 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