Merge pull request #85 from traversaro/bump-ogre-1-12

Build against both ogre 1.12 and 1.10

.ci_support/linux_64_.yaml → .ci_support/linux_64_OGRE_VERSION1.10.yaml

@@ -1,3 +1,5 @@
+OGRE_VERSION:
+- '1.10'
 boost_cpp:
 - 1.74.0
 c_compiler:

.ci_support/linux_64_OGRE_VERSION1.12.yaml

@@ -0,0 +1,64 @@
+OGRE_VERSION:
+- '1.12'
+boost_cpp:
+- 1.74.0
+c_compiler:
+- gcc
+c_compiler_version:
+- '9'
+cdt_name:
+- cos6
+channel_sources:
+- conda-forge,defaults
+channel_targets:
+- conda-forge main
+curl:
+- '7'
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '9'
+docker_image:
+- quay.io/condaforge/linux-anvil-comp7
+ffmpeg:
+- '4.3'
+graphviz:
+- '2.47'
+hdf5:
+- 1.10.6
+libcurl:
+- '7'
+libgdal:
+- '3.3'
+libprotobuf:
+- '3.16'
+libuuid:
+- 2.32.1
+pin_run_as_build:
+  boost-cpp:
+    max_pin: x.x.x
+  curl:
+    max_pin: x
+  graphviz:
+    max_pin: x
+  libcurl:
+    max_pin: x
+  libgdal:
+    max_pin: x.x
+  libuuid:
+    max_pin: x
+  qt:
+    max_pin: x.x
+qt:
+- '5.12'
+target_platform:
+- linux-64
+tbb_devel:
+- '2020'
+tinyxml2:
+- '9'
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+- - cdt_name
+  - docker_image

.ci_support/osx_64_.yaml → .ci_support/osx_64_OGRE_VERSION1.10.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.14'
+OGRE_VERSION:
+- '1.10'
 boost_cpp:
 - 1.74.0
 bzip2:

.ci_support/osx_64_OGRE_VERSION1.12.yaml

@@ -0,0 +1,68 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.14'
+OGRE_VERSION:
+- '1.12'
+boost_cpp:
+- 1.74.0
+bzip2:
+- '1'
+c_compiler:
+- clang
+c_compiler_version:
+- '11'
+channel_sources:
+- conda-forge,defaults
+channel_targets:
+- conda-forge main
+curl:
+- '7'
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '11'
+ffmpeg:
+- '4.3'
+graphviz:
+- '2.47'
+hdf5:
+- 1.10.6
+libcurl:
+- '7'
+libgdal:
+- '3.3'
+libprotobuf:
+- '3.16'
+macos_machine:
+- x86_64-apple-darwin13.4.0
+macos_min_version:
+- '10.14'
+pin_run_as_build:
+  boost-cpp:
+    max_pin: x.x.x
+  bzip2:
+    max_pin: x
+  curl:
+    max_pin: x
+  graphviz:
+    max_pin: x
+  libcurl:
+    max_pin: x
+  libgdal:
+    max_pin: x.x
+  qt:
+    max_pin: x.x
+  zlib:
+    max_pin: x.x
+qt:
+- '5.12'
+target_platform:
+- osx-64
+tbb_devel:
+- '2020'
+tinyxml2:
+- '9'
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+zlib:
+- '1.2'

.ci_support/win_64_.yaml → .ci_support/win_64_OGRE_VERSION1.10.yaml

@@ -1,3 +1,5 @@
+OGRE_VERSION:
+- '1.10'
 boost_cpp:
 - 1.74.0
 c_compiler:

.ci_support/win_64_OGRE_VERSION1.12.yaml

@@ -0,0 +1,41 @@
+OGRE_VERSION:
+- '1.12'
+boost_cpp:
+- 1.74.0
+c_compiler:
+- vs2017
+channel_sources:
+- conda-forge,defaults
+channel_targets:
+- conda-forge main
+curl:
+- '7'
+cxx_compiler:
+- vs2017
+ffmpeg:
+- '4.3'
+hdf5:
+- 1.10.6
+libcurl:
+- '7'
+libgdal:
+- '3.3'
+libprotobuf:
+- '3.16'
+pin_run_as_build:
+  boost-cpp:
+    max_pin: x.x.x
+  curl:
+    max_pin: x
+  libcurl:
+    max_pin: x
+  libgdal:
+    max_pin: x.x
+  qt:
+    max_pin: x.x
+qt:
+- '5.12'
+target_platform:
+- win-64
+tinyxml2:
+- '9'

recipe/conda_build_config.yaml

@@ -3,3 +3,7 @@ macos_min_version:             # [osx]
 MACOSX_DEPLOYMENT_TARGET:      # [osx]
   - 10.14                      # [osx]
 
+# This is done to de-prioritize 1.12
+OGRE_VERSION:
+  - "1.10"
+  - "1.12"

recipe/meta.yaml

@@ -16,11 +16,16 @@ source:
       - fix-invisible-meshes.patch
 
 build:
-  number: 0
+  number: 1
   skip: false
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}
 
+  {% if OGRE_VERSION == "1.12" %}
+  track_features:
+    - gazebo_classic_with_ogre_1_12
+  {% endif %}
+
 requirements:
   build:
     - {{ compiler('cxx') }}
@@ -60,14 +65,19 @@ requirements:
     - libignition-common3
     - libignition-fuel-tools4
     - qt
+    {% if OGRE_VERSION == "1.10" %}
     - ogre 1.10.*
+    {% else %}
+    - ogre 1.12.*
+    {% endif %}
+
     - freeimage
     - curl
     # tbb pinned on Windows due to https://stackoverflow.com/questions/64510477/error-c2061-syntax-error-identifier-concurrent-vectortemplate-type-paramet
     - tbb-devel 2019.9  # [win]
     # tbb pinned on Unix due to https://github.com/conda-forge/gazebo-feedstock/issues/57
     - tbb-devel 2020.2  # [not win]
-    - qwt
+    - qwt 6.1.*
     - tinyxml2
     - libtar   # [unix]
     - libccd   # [unix]