Skip to content

Commit

Permalink
Bumps in ionic : ci_matching_branch/bump_ionic_gz-msgs11 (#401)
Browse files Browse the repository at this point in the history
Signed-off-by: Addisu Z. Taddese <[email protected]>
  • Loading branch information
azeey authored Oct 17, 2023
1 parent ba82a93 commit 03cacdb
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .github/ci/packages.apt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
libgz-cmake3-dev
libgz-math7-dev
libgz-cmake4-dev
libgz-math8-dev
libgz-tools2-dev
libprotobuf-dev
libprotoc-dev
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ project(gz-msgs11 VERSION 11.0.0)
# Find gz-cmake
#============================================================================
# If you get an error at this line, you need to install gz-cmake
find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)

#============================================================================
# Configure the project
Expand Down Expand Up @@ -77,13 +77,13 @@ gz_find_package(GzProtobuf

#--------------------------------------
# Find gz-utils
gz_find_package(gz-utils2 REQUIRED)
set(GZ_UTILS_VER ${gz-utils2_VERSION_MAJOR})
gz_find_package(gz-utils3 REQUIRED)
set(GZ_UTILS_VER ${gz-utils3_VERSION_MAJOR})

#--------------------------------------
# Find gz-math
gz_find_package(gz-math7 REQUIRED)
set(GZ_MATH_VER ${gz-math7_VERSION_MAJOR})
gz_find_package(gz-math8 REQUIRED)
set(GZ_MATH_VER ${gz-math8_VERSION_MAJOR})

find_package(Python3 REQUIRED COMPONENTS Interpreter)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ line is using symbolic links to each library's YAML file.
mkdir ~/.gz/tools/configs -p
cd ~/.gz/tools/configs/
ln -s /usr/local/share/gz/fuel8.yaml .
ln -s /usr/local/share/gz/transport13.yaml .
ln -s /usr/local/share/gz/transportlog13.yaml .
ln -s /usr/local/share/gz/transport14.yaml .
ln -s /usr/local/share/gz/transportlog14.yaml .
...
export GZ_CONFIG_PATH=$HOME/.gz/tools/configs
```
Expand Down
2 changes: 1 addition & 1 deletion core/src/MessageFactory.cc
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ MessageFactory::MessagePtr MessageFactory::New(
{
std::cerr << "Message (" << kGzMsgsPrefix + type
<< ") was retrieved with non-fully qualified name. "
<< "This behavior is deprecated in msgs10" << std::endl;
<< "This behavior is deprecated in msgs11" << std::endl;
}
}
return ret;
Expand Down
2 changes: 1 addition & 1 deletion examples/generating_custom_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project(generating_custom_messages VERSION 1.0.0)
#============================================================================
# Find gz-cmake
#============================================================================
find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)

find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion examples/using_gz_msgs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ project(using_gz_msgs VERSION 1.0.0)
#============================================================================
# Find gz-cmake
#============================================================================
find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)

find_package(gz-msgs11 REQUIRED)
set(GZ_MSGS_VER ${gz-msgs11_VERSION_MAJOR})
Expand Down
2 changes: 1 addition & 1 deletion tutorials/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ which version you need.

Install required dependencies as follows:
```
sudo apt-get install libprotobuf-dev protobuf-compiler libprotoc-dev libgz-math7-dev
sudo apt-get install libprotobuf-dev protobuf-compiler libprotoc-dev libgz-math8-dev
```

### Building from Source
Expand Down
2 changes: 1 addition & 1 deletion tutorials/message_generation.md
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ To make the functions available, simply `find_package(gz-msgs11)` in your `CMake
```cmake
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(my_custom_package VERSION 0.0.1)
find_package(gz-cmake3 REQUIRED)
find_package(gz-cmake4 REQUIRED)
find_package(gz-msgs11 REQUIRED)
```

Expand Down

0 comments on commit 03cacdb

Please sign in to comment.