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 12.0.0~pre1 #271

Merged
merged 1 commit into from
Oct 11, 2021
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(ignition-transport11 VERSION 11.0.0)
project(ignition-transport12 VERSION 12.0.0)

#============================================================================
# Find ignition-cmake
Expand Down
6 changes: 5 additions & 1 deletion Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Ignition Transport 12.X

### Ignition Transport 12.0.0 (202X-XX-XX)

## Ignition Transport 11.X

### Ignition Transport 11.0.0 (2021-XX-XX)
Expand Down Expand Up @@ -40,7 +44,7 @@
1. Consider all network interfaces when checking HOST option.
* [Github pull request 245](https://github.com/ignitionrobotics/ign-transport/pull/245)

1. Remove tools/code_check and update codecov.
1. Remove tools/code_check and update codecov.
* [Github pull request 246](https://github.com/ignitionrobotics/ign-transport/pull/246)

1. Remove deprecated test.
Expand Down
4 changes: 2 additions & 2 deletions example/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)
project(ignition-transport-examples)

# Find the Ignition_Transport library
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})
find_package(ignition-transport12 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport12_VERSION_MAJOR})

if (EXISTS "${CMAKE_SOURCE_DIR}/msgs/")
# Message generation. Only required when using custom Protobuf messages.
Expand Down
2 changes: 1 addition & 1 deletion example/configure.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
@set IGNITION-MATH_CMAKE_PREFIX_PATH=%IGNITION-MATH_PATH%\CMake

cmake -G "NMake Makefiles"^
-DCMAKE_PREFIX_PATH="%IGN_TRANSPORT_PATH%\lib\cmake\ignition-transport11;%IGNITION-MSGS_CMAKE_PREFIX_PATH%;%IGNITION-MATH_CMAKE_PREFIX_PATH%;"^
-DCMAKE_PREFIX_PATH="%IGN_TRANSPORT_PATH%\lib\cmake\ignition-transport12;%IGNITION-MSGS_CMAKE_PREFIX_PATH%;%IGNITION-MATH_CMAKE_PREFIX_PATH%;"^
-DPROTOBUF_SRC_ROOT_FOLDER="%PROTOBUF_PATH%"^
-DIGNITION-MSGS_FOLDER="%IGNITION-MSGS_PATH%"^
-DCMAKE_INSTALL_PREFIX="install"^
Expand Down