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

Multiple ogre + OSX #5

Merged
merged 19 commits into from
Oct 8, 2021
Merged

Multiple ogre + OSX #5

Show file tree
Hide file tree
Changes from 18 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
775ecaa
Build for multiple ogre
Tobias-Fischer Mar 23, 2021
184fb78
Bump build num and multiple ogre and build osx
Tobias-Fischer Mar 23, 2021
34e256d
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and con…
Mar 23, 2021
e76313a
Update meta.yaml
Tobias-Fischer Mar 23, 2021
c3844cc
Rename conda_build_config.yml to conda_build_config.yaml
Tobias-Fischer Mar 23, 2021
d250a87
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.9.0, and con…
Mar 23, 2021
0d40998
Update meta.yaml
Tobias-Fischer Mar 23, 2021
79a99ca
Try fix OSX tests
Tobias-Fischer Mar 25, 2021
d9b5e26
Update build.sh
Tobias-Fischer Mar 25, 2021
393245d
Update build.sh
Tobias-Fischer Mar 25, 2021
382159e
Update build.sh
Tobias-Fischer May 13, 2021
c0c4ec2
Merge branch 'master' into multiple-ogre
Tobias-Fischer May 13, 2021
6eb4aca
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.10.1, and co…
May 13, 2021
d65214d
Update build.sh
Tobias-Fischer May 13, 2021
e3deb91
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and cond…
Oct 7, 2021
d5ab59b
Merge branch 'master' into multiple-ogre
traversaro Oct 7, 2021
f35bdcb
MNT: Re-rendered with conda-build 3.21.4, conda-smithy 3.12, and cond…
Oct 7, 2021
db2d525
Skip failing tests on osx
Tobias-Fischer Oct 7, 2021
b23b59d
Update meta.yaml
traversaro Oct 8, 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
8 changes: 6 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.

31 changes: 31 additions & 0 deletions .azure-pipelines/azure-pipelines-osx.yml
View file
Open in desktop

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

7 changes: 5 additions & 2 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

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

4 changes: 3 additions & 1 deletion .ci_support/linux_64_.yaml → .ci_support/linux_64_ogre1.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ c_compiler_version:
cdt_name:
- cos6
channel_sources:
- conda-forge,defaults
- conda-forge
channel_targets:
- conda-forge main
cxx_compiler:
Expand All @@ -16,6 +16,8 @@ docker_image:
- quay.io/condaforge/linux-anvil-comp7
libprotobuf:
- '3.18'
ogre:
- '1.10'
target_platform:
- linux-64
zip_keys:
Expand Down
27 changes: 27 additions & 0 deletions .ci_support/linux_64_ogre1.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
29 changes: 29 additions & 0 deletions .ci_support/osx_64_ogre1.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
29 changes: 29 additions & 0 deletions .ci_support/osx_64_ogre1.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
4 changes: 3 additions & 1 deletion .ci_support/win_64_.yaml → .ci_support/win_64_ogre1.10.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
14 changes: 14 additions & 0 deletions .ci_support/win_64_ogre1.12.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
69 changes: 69 additions & 0 deletions .scripts/run_osx_build.sh
View file
Open in desktop

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

36 changes: 32 additions & 4 deletions README.md
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion azure-pipelines.yml
View file
Open in desktop

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

10 changes: 8 additions & 2 deletions recipe/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 4 additions & 0 deletions recipe/conda_build_config.yml → recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 4 additions & 2 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ source:
sha256: 2484b82d2122633956fdf3fab9e8a41fd8c18de3055d059ec461c9b9153c3257

build:
number: 3
skip: true # [osx]
number: 4
run_exports:
- {{ pin_subpackage(name, max_pin='x') }}

Expand All @@ -36,8 +35,11 @@ requirements:
- libignition-msgs7
- libignition-plugin1
- libsdformat11
- libarchive # [osx]
- ogre {{ ogre }}
run:
- __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }} # [osx and x86_64]
- {{ pin_compatible('ogre', max_pin='x.x') }}
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should not be needed actually.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

https://github.com/conda-forge/ogre-feedstock/blob/6a69a77b79acce745d2bc6fd3d6656dfc1ed0dc3/recipe/meta.yaml#L21-L22

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is true for the latest version of ogre, but note that here we link a bit old versions such as 1.10 or 1.12, the run_exports are set correctly also there?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the latest 1.10 build has it as well: https://github.com/conda-forge/ogre-feedstock/blob/5235a903689d335447e76f1397d62afd4b9b7dda/recipe/meta.yaml#L19

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great, let's remove it then.


test:
commands:
Expand Down