Skip to content

Commit 5d07cbb

Browse files
committed
Merged in merge23 (pull request #153)
Merge 2 -> 3 (pr #152) Approved-by: Steve Peters <scpeters@osrfoundation.org>
2 parents b5e0992 + f1ba214 commit 5d07cbb

File tree

4 files changed

+23
-47
lines changed

4 files changed

+23
-47
lines changed

Changelog.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
* [Issue 24](https://bitbucket.org/ignitionrobotics/ign-msgs/issues/24)
88
* [Issue 27](https://bitbucket.org/ignitionrobotics/ign-msgs/issues/27)
99

10+
1. Fix linking order of Protocol Buffers static libraries on GCC
11+
* [Pull request 151](https://bitbucket.org/ignitionrobotics/ign-msgs/pull-request/151)
12+
1013
### Ignition Msgs 3.2.0
1114

1215
1. Added Pose_V, Time, and Clock fields to packet.proto
@@ -62,6 +65,14 @@
6265

6366
### Ignition Msgs 2.x.x
6467

68+
1. Fix linking order of Protocol Buffers static libraries on GCC
69+
* [Pull request 151](https://bitbucket.org/ignitionrobotics/ign-msgs/pull-request/151)
70+
71+
### Ignition Msgs 2.1.0
72+
73+
1. Upgrade to ign-math6
74+
* [Pull request 138](https://bitbucket.org/ignitionrobotics/ign-msgs/pull-request/138)
75+
6576

6677
### Ignition Msgs 2.0.0
6778

Migration.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,16 @@ release will remove the deprecated code.
5050
### Removals
5151

5252

53-
## Ignition Msgs 1.X to 2.X
53+
## Ignition Msgs 2.0 to 2.1
54+
55+
### Modifications
56+
57+
1. Use `ignition-math6` instead of `ignition-math5`.
58+
This implies an indirect dependency on `ignition-cmake2` and cmake 3.10.2,
59+
which are not available on Ubuntu Xenial, so migration to Ubuntu Bionic may
60+
be required.
61+
62+
## Ignition Msgs 1.X to 2.0
5463

5564
### Additions
5665

src/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Build a custom protoc plugin
33
ign_add_executable(ign_msgs_gen Generator.cc generator_main.cc)
44
target_link_libraries(ign_msgs_gen
5-
protobuf::libprotobuf
6-
protobuf::libprotoc)
5+
protobuf::libprotoc
6+
protobuf::libprotobuf)
77
target_include_directories(ign_msgs_gen PRIVATE ${PROTOBUF_INCLUDE_DIR})
88
target_compile_features(ign_msgs_gen PRIVATE ${IGN_CXX_11_FEATURES})
99

test/gtest/gtest-1.7.0.diff

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)