Skip to content

Commit

Permalink
Bump main to 4.0.0~pre1 (part 2) (#298)
Browse files Browse the repository at this point in the history
Signed-off-by: Jenn Nguyen <jenn@openrobotics.org>
  • Loading branch information
jennuine authored Aug 8, 2022
1 parent 332b976 commit 9978a78
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion MigrationFromClassic.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ That's right, just throw it all out.
We're migrating to 3.10 because it provides many valuable features that we are
now taking advantage of.

### Then call `find_package(gz-cmake3 REQUIRED)`
### Then call `find_package(gz-cmake4 REQUIRED)`

This will find `gz-cmake` and load up all its useful features for you.

Expand Down
2 changes: 1 addition & 1 deletion cmake/GzPython.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ else()
endif()

# Tick-tock PYTHON_EXECUTABLE until Python3_EXECUTABLE is released
# TODO(jrivero) gz-cmake3: start the deprecation cycle of PYTHON_EXECUTABLE
# TODO(jrivero) gz-cmake4: start the deprecation cycle of PYTHON_EXECUTABLE
if(Python3_EXECUTABLE AND NOT PYTHON_EXECUTABLE)
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
endif()
2 changes: 1 addition & 1 deletion examples/find_ogre2/ogre-2.1/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-ogre-2.1 VERSION 0.1.0)

find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)

message(STATUS "Finding OGRE 2.1")

Expand Down
2 changes: 1 addition & 1 deletion examples/find_ogre2/ogre-2.2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-ogre-2.2 VERSION 0.1.0)

find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)

message(STATUS "Finding OGRE 2.2")

Expand Down
2 changes: 1 addition & 1 deletion examples/find_ogre2/ogre-2.3/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(gz-ogre-2.3 VERSION 0.1.0)

find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)

message(STATUS "Finding OGRE 2.3")

Expand Down

0 comments on commit 9978a78

Please sign in to comment.