Merge pull request #5 from Tobias-Fischer/multiple-ogre

Multiple ogre + OSX

.ci_support/linux_64_.yaml → .ci_support/linux_64_ogre1.10.yaml

@@ -5,7 +5,7 @@ c_compiler_version:
 cdt_name:
 - cos6
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
@@ -16,6 +16,8 @@ docker_image:
 - quay.io/condaforge/linux-anvil-comp7
 libprotobuf:
 - '3.18'
+ogre:
+- '1.10'
 target_platform:
 - linux-64
 zip_keys:

.ci_support/linux_64_ogre1.12.yaml

@@ -0,0 +1,27 @@
+c_compiler:
+- gcc
+c_compiler_version:
+- '9'
+cdt_name:
+- cos6
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '9'
+docker_image:
+- quay.io/condaforge/linux-anvil-comp7
+libprotobuf:
+- '3.18'
+ogre:
+- '1.12'
+target_platform:
+- linux-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+- - cdt_name
+  - docker_image

.ci_support/osx_64_ogre1.10.yaml

@@ -0,0 +1,29 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.13'
+c_compiler:
+- clang
+c_compiler_version:
+- '11'
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '11'
+libarchive:
+- '3.5'
+libprotobuf:
+- '3.18'
+macos_machine:
+- x86_64-apple-darwin13.4.0
+macos_min_version:
+- '10.13'
+ogre:
+- '1.10'
+target_platform:
+- osx-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version

.ci_support/osx_64_ogre1.12.yaml

@@ -0,0 +1,29 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.13'
+c_compiler:
+- clang
+c_compiler_version:
+- '11'
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '11'
+libarchive:
+- '3.5'
+libprotobuf:
+- '3.18'
+macos_machine:
+- x86_64-apple-darwin13.4.0
+macos_min_version:
+- '10.13'
+ogre:
+- '1.12'
+target_platform:
+- osx-64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version

.ci_support/win_64_.yaml → .ci_support/win_64_ogre1.10.yaml

@@ -1,12 +1,14 @@
 c_compiler:
 - vs2017
 channel_sources:
-- conda-forge,defaults
+- conda-forge
 channel_targets:
 - conda-forge main
 cxx_compiler:
 - vs2017
 libprotobuf:
 - '3.18'
+ogre:
+- '1.10'
 target_platform:
 - win-64

.ci_support/win_64_ogre1.12.yaml

@@ -0,0 +1,14 @@
+c_compiler:
+- vs2017
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- vs2017
+libprotobuf:
+- '3.18'
+ogre:
+- '1.12'
+target_platform:
+- win-64

recipe/build.sh

@@ -8,11 +8,17 @@ cmake ${CMAKE_ARGS} \
       -DCMAKE_PREFIX_PATH=$PREFIX \
       -DCMAKE_INSTALL_PREFIX=$PREFIX \
       -DCMAKE_INSTALL_LIBDIR=lib \
-      -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=True \
+      -DCMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP=TRUE \
+      -DCMAKE_MACOSX_RPATH=FALSE \
       -DBUILD_SHARED_LIBS=ON \
       -DBUILD_TESTING=ON \
       ..
 
 cmake --build . --config Release
 cmake --build . --config Release --target install
-ctest --output-on-failure -C Release
+
+if [[ ${HOST} =~ .*darwin.* ]]; then
+    ctest --output-on-failure -C Release -E "UNIT_Lidar_TEST|UNIT_Camera_TEST|INTEGRATION_camera_plugin|INTEGRATION_depth_camera_plugin|INTEGRATION_gpu_lidar_sensor_plugin|INTEGRATION_rgbd_camera_plugin|INTEGRATION_thermal_camera_plugin"
+else
+    ctest --output-on-failure -C Release
+fi

recipe/conda_build_config.yml → recipe/conda_build_config.yaml

@@ -2,3 +2,7 @@ macos_min_version:             # [osx and x86_64]
   - 10.13                      # [osx and x86_64]
 MACOSX_DEPLOYMENT_TARGET:      # [osx and x86_64]
   - 10.13                      # [osx and x86_64]
+
+ogre:
+  - 1.10
+  - 1.12

recipe/meta.yaml

@@ -14,8 +14,7 @@ source:
     sha256: 2484b82d2122633956fdf3fab9e8a41fd8c18de3055d059ec461c9b9153c3257
 
 build:
-  number: 3
-  skip: true  # [osx]
+  number: 4
   run_exports:
     - {{ pin_subpackage(name, max_pin='x') }}
 
@@ -36,6 +35,8 @@ requirements:
     - libignition-msgs7
     - libignition-plugin1
     - libsdformat11
+    - libarchive  # [osx]
+    - ogre  {{ ogre }}
   run:
     - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}  # [osx and x86_64]