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.

Sign up for GitHub

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

Jump to bottom

Bump version to Gazebo 11.3.0 #37

Merged
merged 8 commits into from
Nov 28, 2020
Merged

Bump version to Gazebo 11.3.0 #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
57568b4
updated v11.3.0
regro-cf-autotick-bot Nov 26, 2020
8e1bb56
MNT: Re-rendered with conda-build 3.20.5, conda-smithy 3.8.5, and con…
regro-cf-autotick-bot Nov 26, 2020
849268e
Update meta.yaml
traversaro Nov 26, 2020
fc86b05
Update bld.bat
traversaro Nov 26, 2020
0153e24
Update meta.yaml
traversaro Nov 26, 2020
f1b757c
Update meta.yaml
traversaro Nov 26, 2020
c3b783d
Update meta.yaml
traversaro Nov 27, 2020
36debe8
Update fix_build.patch
traversaro Nov 27, 2020
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
4 changes: 2 additions & 2 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .ci_support/linux_64_boost_cpp1.72.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ boost_cpp:
c_compiler:
- gcc
c_compiler_version:
- '7'
- '9'
cdt_name:
- cos6
channel_sources:
Expand All @@ -15,9 +15,9 @@ curl:
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
- '9'
docker_image:
- condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-comp7
libcurl:
- '7'
libprotobuf:
Expand Down
6 changes: 3 additions & 3 deletions .ci_support/linux_64_boost_cpp1.74.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ boost_cpp:
c_compiler:
- gcc
c_compiler_version:
- '7'
- '9'
cdt_name:
- cos6
channel_sources:
Expand All @@ -15,9 +15,9 @@ curl:
cxx_compiler:
- gxx
cxx_compiler_version:
- '7'
- '9'
docker_image:
- condaforge/linux-anvil-comp7
- quay.io/condaforge/linux-anvil-comp7
libcurl:
- '7'
libprotobuf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_boost_cpp1.72.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '10'
- '11'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -17,7 +17,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '10'
- '11'
libcurl:
- '7'
libprotobuf:
Expand Down
4 changes: 2 additions & 2 deletions .ci_support/osx_64_boost_cpp1.74.0.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ bzip2:
c_compiler:
- clang
c_compiler_version:
- '10'
- '11'
channel_sources:
- conda-forge,defaults
channel_targets:
Expand All @@ -17,7 +17,7 @@ curl:
cxx_compiler:
- clangxx
cxx_compiler_version:
- '10'
- '11'
libcurl:
- '7'
libprotobuf:
Expand Down
1 change: 1 addition & 0 deletions recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ cmake ^
-DTBB_FOUND=1 ^
-DTBB_INCLUDEDIR=%LIBRARY_PREFIX%\include ^
-DTBB_LIBRARY_DIR=%LIBRARY_PREFIX%\lib ^
-DUSE_EXTERNAL_TINY_PROCESS_LIBRARY=ON ^
%SRC_DIR%
if errorlevel 1 exit 1

Expand Down
47 changes: 0 additions & 47 deletions recipe/fix_build.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,53 +146,6 @@ index 90f7ee01ed..0959f3d4c3 100644
${Boost_LIBRARIES})

if (HAVE_BULLET)
diff --git a/gazebo/gui/plot/qwt_gazebo.h b/gazebo/gui/plot/qwt_gazebo.h
index c548b91249..8063475108 100644
--- a/gazebo/gui/plot/qwt_gazebo.h
+++ b/gazebo/gui/plot/qwt_gazebo.h
@@ -23,24 +23,24 @@
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wfloat-equal"

-#include <qwt/qwt_curve_fitter.h>
-#include <qwt/qwt_legend.h>
-#include <qwt/qwt_painter.h>
-#include <qwt/qwt_picker_machine.h>
-#include <qwt/qwt_plot.h>
-#include <qwt/qwt_plot_canvas.h>
-#include <qwt/qwt_plot_curve.h>
-#include <qwt/qwt_plot_directpainter.h>
-#include <qwt/qwt_plot_grid.h>
-#include <qwt/qwt_plot_layout.h>
-#include <qwt/qwt_plot_magnifier.h>
-#include <qwt/qwt_plot_marker.h>
-#include <qwt/qwt_plot_panner.h>
-#include <qwt/qwt_plot_zoomer.h>
-#include <qwt/qwt_scale_engine.h>
-#include <qwt/qwt_scale_widget.h>
-#include <qwt/qwt_symbol.h>
-#include <qwt/qwt_plot_renderer.h>
+#include <qwt_curve_fitter.h>
+#include <qwt_legend.h>
+#include <qwt_painter.h>
+#include <qwt_picker_machine.h>
+#include <qwt_plot.h>
+#include <qwt_plot_canvas.h>
+#include <qwt_plot_curve.h>
+#include <qwt_plot_directpainter.h>
+#include <qwt_plot_grid.h>
+#include <qwt_plot_layout.h>
+#include <qwt_plot_magnifier.h>
+#include <qwt_plot_marker.h>
+#include <qwt_plot_panner.h>
+#include <qwt_plot_zoomer.h>
+#include <qwt_scale_engine.h>
+#include <qwt_scale_widget.h>
+#include <qwt_symbol.h>
+#include <qwt_plot_renderer.h>

#pragma clang diagnostic pop

diff --git a/gazebo/msgs/CMakeLists.txt b/gazebo/msgs/CMakeLists.txt
index cc19f5fa1e..32f5d11e04 100644
--- a/gazebo/msgs/CMakeLists.txt
Expand Down
7 changes: 3 additions & 4 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
{% set name = "gazebo" %}
{% set version = "11.2.0" %}
{% set version = "11.3.0" %}

package:
name: {{ name }}
version: {{ version }}

source:
- url: https://github.com/osrf/{{ name }}/archive/{{ name }}{{ version.split('.')[0] }}_{{ version }}.tar.gz
sha256: 4b59b5d43805ca094dfe06027b1cbcb5fb81790c873cdce6ad41e270f0cc7fc4
sha256: b3c14fc1a123be2992b880efa11d362d3d06c77d8c9624a14c487357ec7623f1
patches:
- fix_build.patch # [unix]
- use-external-libs-config.patch # [win]
- qwt-fix.patch # [win]
- normalize-ogre-path.patch # [win]
- fix_boost_include.patch

build:
number: 0
Expand Down Expand Up @@ -77,6 +75,7 @@ requirements:
# - gts
- bzip2 # [osx]
- zlib # [osx]
- tiny-process-library # [win]

run:
- xorg-libxext # [unix]
Expand Down