Skip to content

Commit

Permalink
Bump main to 11.0.0~pre1 (#236)
Browse files Browse the repository at this point in the history
Signed-off-by: Louise Poubel <[email protected]>
Signed-off-by: Carlos Agüero <[email protected]>

Co-authored-by: Carlos Agüero <[email protected]>
  • Loading branch information
chapulina and caguero authored Apr 5, 2021
1 parent 222d4d6 commit 3f6691d
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 11 deletions.
4 changes: 2 additions & 2 deletions 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-transport10 VERSION 10.0.0)
project(ignition-transport11 VERSION 11.0.0)

#============================================================================
# Find ignition-cmake
Expand All @@ -15,7 +15,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
#============================================================================
# Configure the project
#============================================================================
ign_configure_project(VERSION_SUFFIX pre2)
ign_configure_project(VERSION_SUFFIX pre1)

#============================================================================
# Set project-specific options
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## Ignition Transport 11.X

### Ignition Transport 11.0.0 (2021-XX-XX)

## Ignition Transport 10.X

### Ignition Transport 10.X.X
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,11 @@ combination of custom code and ZeroMQ.

# Install

See the [installation tutorial](https://ignitionrobotics.org/api/transport/10.0/installation.html).
See the [installation tutorial](https://ignitionrobotics.org/api/transport/11.0/installation.html).

# Usage

See [tutorials](https://ignitionrobotics.org/api/transport/10.0/tutorials.html)
See [tutorials](https://ignitionrobotics.org/api/transport/11.0/tutorials.html)
and the [example directory](https://github.com/ignitionrobotics/ign-transport/blob/main/example/)
in the source code.

Expand Down Expand Up @@ -94,7 +94,7 @@ This issue is tracked [here](https://github.com/ignitionrobotics/ign-tools/issue

# Documentation

Visit the [documentation page](https://ignitionrobotics.org/api/transport/10.0/index.html).
Visit the [documentation page](https://ignitionrobotics.org/api/transport/11.0/index.html).

# Folder Structure

Expand Down
8 changes: 4 additions & 4 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-transport10 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport10_VERSION_MAJOR})
find_package(ignition-transport11 QUIET REQUIRED OPTIONAL_COMPONENTS log)
set(IGN_TRANSPORT_VER ${ignition-transport11_VERSION_MAJOR})

if (EXISTS "${CMAKE_SOURCE_DIR}/msgs/")
# Message generation. Only required when using custom Protobuf messages.
Expand Down Expand Up @@ -120,7 +120,7 @@ if (EXISTS "${CMAKE_SOURCE_DIR}/requester_async_no_input.cc")
endif()

# FIXME(chapulina) Linking failure on Windows:
# msgs\stringmsg.pb.cc : fatal error LNK1107: invalid or corrupt file: cannot read at 0x3028
# msgs\stringmsg.pb.cc : fatal error LNK1107: invalid or corrupt file: cannot read at 0x3028
if (NOT MSVC AND TARGET protobuf_compilation AND
EXISTS "${CMAKE_SOURCE_DIR}/publisher_custom_msg.cc")
add_executable(publisher_custom_msg publisher_custom_msg.cc)
Expand All @@ -132,7 +132,7 @@ if (NOT MSVC AND TARGET protobuf_compilation AND
endif()

# FIXME(chapulina) Linking failure on Windows:
# msgs\stringmsg.pb.cc : fatal error LNK1107: invalid or corrupt file: cannot read at 0x3028
# msgs\stringmsg.pb.cc : fatal error LNK1107: invalid or corrupt file: cannot read at 0x3028
if (NOT MSVC AND TARGET protobuf_compilation AND
EXISTS "${CMAKE_SOURCE_DIR}/subscriber_custom_msg.cc")
add_executable(subscriber_custom_msg subscriber_custom_msg.cc)
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-transport10;%IGNITION-MSGS_CMAKE_PREFIX_PATH%;%IGNITION-MATH_CMAKE_PREFIX_PATH%;"^
-DCMAKE_PREFIX_PATH="%IGN_TRANSPORT_PATH%\lib\cmake\ignition-transport11;%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
2 changes: 1 addition & 1 deletion tutorials/02_installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ conda install libignition-cmake<#> libignition-msgs<#> libignition-tools<#> --ch

# Documentation

Visit the [documentation page](https://ignitionrobotics.org/api/transport/10.0/index.html).
Visit the [documentation page](https://ignitionrobotics.org/api/transport/11.0/index.html).

## Build documentation
```
Expand Down

0 comments on commit 3f6691d

Please sign in to comment.