Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

⬆️ Bump main to 4.0.0~pre1 #296

Merged
merged 1 commit into from
Aug 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## Gazebo CMake 4.x



## Gazebo CMake 3.x


## Gazebo CMake 2.x

### Gazebo CMake 2.14.0 (2022-07-25)
Expand Down
2 changes: 1 addition & 1 deletion examples/comp_deps/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion examples/core_child/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/core_child_private/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/core_nodep/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion examples/core_nodep_static/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion examples/core_static_child/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/gz_conf/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion examples/no_gz_prefix/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/prerelease/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion examples/sanitizers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion examples/use_component_depsA/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/use_component_depsB/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/use_component_depsC/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
2 changes: 1 addition & 1 deletion examples/use_config_ifp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down