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

4 to 5 20210412 #758

Merged
merged 32 commits into from
May 4, 2021
Merged
Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
40ec477
🎈 3.8.0 (#688)
chapulina Mar 17, 2021
dc52dfc
Make it so joint state publisher is quieter (#696)
mjcarroll Mar 19, 2021
a84ec51
[BULLET] Making GetContactsFromLastStepFeature optional in Collision …
Lobotuerk Mar 19, 2021
9b53797
Add test for thermal object temperatures below 0 kelvin (#621)
adlarkin Feb 10, 2021
f422c02
Scenebroadcaster sensors (#698)
nkoenig Mar 22, 2021
2d6c0fa
Fix diffuse and ambient values for ackermann example (#707)
ammaar8 Mar 25, 2021
8301de8
Support configuring particle scatter ratio in particle emitter system…
iche033 Apr 1, 2021
66c0767
Do not pass -Wno-unused-parameter to MSVC compiler (#716)
traversaro Apr 5, 2021
dfb43a0
Use Protobuf_IMPORT_DIRS instead of PROTOBUF_IMPORT_DIRS for compatib…
traversaro Apr 5, 2021
8567614
Validate step size and RTF parameters (#740)
luca-della-vedova Apr 5, 2021
4e69556
Fix compute_rtfs arguments (#737)
caioaamaral Apr 6, 2021
3e8d4e7
Fixed collision visual bounding boxes (#746)
jennuine Apr 7, 2021
573df54
Merging 3 to 4
Apr 8, 2021
2f3d544
Fix CMakelists.txt merge
Apr 8, 2021
8829840
Merge pull request #750 from ignitionrobotics/3-to-4-20210408
nkoenig Apr 8, 2021
9b24362
ECM's ChangedState gets message with modified components (#742)
jennuine Apr 9, 2021
0eb4514
fixed particle emitter forward playback (#745)
jennuine Apr 9, 2021
0ec8a43
Merge pull request #730 from ignitionrobotics/particle_emitter
nkoenig Apr 9, 2021
f6ebad6
4 7 0 prep (#755)
nkoenig Apr 10, 2021
33b37c5
Update benchmark comparison instructions (#766) (#766)
adlarkin Apr 14, 2021
9ab72ba
Add odometry publisher system (#547)
mrushyendra Apr 21, 2021
e1507e8
Patch particle emitter2 service (#777)
nkoenig Apr 22, 2021
1f564df
Preparing for 4.8.0 release (#780)
nkoenig Apr 22, 2021
c46c69b
👩‍🌾 Enable Focal CI (#646)
chapulina Apr 24, 2021
a5f80cc
[TPE] Support setting individual link velocity (#427)
claireyywang Apr 24, 2021
5031702
Don't store duplicate ComponentTypeId in ECM (#751)
chapulina Apr 24, 2021
361982a
Fix macOS build: components::Name in benchmark (#784)
chapulina Apr 26, 2021
23be342
3 ➡️ 4
chapulina Apr 29, 2021
803130e
Bump ign-physics version to 3.2 (#792)
chapulina Apr 29, 2021
1326174
3 ➡️ 4 (#792)
chapulina Apr 29, 2021
2fc9b6f
4 to 5
chapulina Apr 30, 2021
b452fc6
Bump to ign-msgs 7.1 / sdformat 11.1, Windows fixes (#758)
chapulina May 1, 2021
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
Prev Previous commit
Next Next commit
Use Protobuf_IMPORT_DIRS instead of PROTOBUF_IMPORT_DIRS for compatib…
…ility with Protobuf CMake config (#715)

Signed-off-by: Silvio Traversaro <silvio.traversaro@iit.it>
  • Loading branch information
traversaro authored Apr 5, 2021
commit dfb43a0f0fa63f575d600c909275cb8a323339c8
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.5.1 FATAL_ERROR)
cmake_minimum_required(VERSION 3.10.2 FATAL_ERROR)

#============================================================================
# Initialize the project
@@ -136,7 +136,7 @@ ign_find_package(IgnProtobuf
REQUIRED
COMPONENTS all
PRETTY Protobuf)
set(PROTOBUF_IMPORT_DIRS ${ignition-msgs5_INCLUDE_DIRS})
set(Protobuf_IMPORT_DIRS ${ignition-msgs5_INCLUDE_DIRS})

# Plugin install dirs
set(IGNITION_GAZEBO_PLUGIN_INSTALL_DIR