Skip to content

Commit

Permalink
Merge pull request #208 from traversaro/fixgzclobbering
Browse files Browse the repository at this point in the history
 Add variants to permit clean co-installation with libgz-tools2
  • Loading branch information
traversaro authored Apr 7, 2024
2 parents 8084907 + dd94c4a commit 7f401f3
Show file tree
Hide file tree
Showing 20 changed files with 629 additions and 30 deletions.
22 changes: 16 additions & 6 deletions .azure-pipelines/azure-pipelines-linux.yml

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

20 changes: 14 additions & 6 deletions .azure-pipelines/azure-pipelines-osx.yml

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

10 changes: 7 additions & 3 deletions .azure-pipelines/azure-pipelines-win.yml

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

72 changes: 72 additions & 0 deletions .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.3.1
bullet_cpp:
- '3.25'
c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
curl:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
ffmpeg:
- '6'
graphviz:
- '9'
hdf5:
- 1.14.3
libabseil:
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.84'
libcblas:
- 3.9 *netlib
libcurl:
- '8'
libgdal:
- '3.8'
libode:
- 0.16.2
libprotobuf:
- 4.25.3
libuuid:
- '2'
libxcb:
- '1.15'
pin_run_as_build:
graphviz:
max_pin: x
qt_main:
- '5.15'
target_platform:
- linux-64
tbb_devel:
- '2021'
tinyxml2:
- '10'
urdfdom:
- '4.0'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.3.1
bullet_cpp:
Expand Down
76 changes: 76 additions & 0 deletions .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
GZ_CLI_NAME_VARIANT:
- gzcompatname
assimp:
- 5.3.1
bullet_cpp:
- '3.25'
c_compiler:
- gcc
c_compiler_version:
- '12'
c_stdlib:
- sysroot
c_stdlib_version:
- '2.17'
cdt_arch:
- aarch64
cdt_name:
- cos7
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
curl:
- '8'
cxx_compiler:
- gxx
cxx_compiler_version:
- '12'
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
ffmpeg:
- '6'
graphviz:
- '9'
hdf5:
- 1.14.3
libabseil:
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.84'
libcblas:
- 3.9 *netlib
libcurl:
- '8'
libgdal:
- '3.8'
libode:
- 0.16.2
libprotobuf:
- 4.25.3
libuuid:
- '2'
libxcb:
- '1.15'
pin_run_as_build:
graphviz:
max_pin: x
qt_main:
- '5.15'
target_platform:
- linux-aarch64
tbb_devel:
- '2021'
tinyxml2:
- '10'
urdfdom:
- '4.0'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
- - c_stdlib_version
- cdt_name
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
BUILD:
- aarch64-conda_cos7-linux-gnu
GZ_CLI_NAME_VARIANT:
- origname
assimp:
- 5.3.1
bullet_cpp:
Expand Down
74 changes: 74 additions & 0 deletions .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
GZ_CLI_NAME_VARIANT:
- gzcompatname
MACOSX_DEPLOYMENT_TARGET:
- '10.15'
assimp:
- 5.3.1
bullet_cpp:
- '3.25'
bzip2:
- '1'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '10.15'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
curl:
- '8'
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
ffmpeg:
- '6'
graphviz:
- '9'
hdf5:
- 1.14.3
libabseil:
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.84'
libcblas:
- 3.9 *netlib
libcurl:
- '8'
libgdal:
- '3.8'
libode:
- 0.16.2
libprotobuf:
- 4.25.3
libxcb:
- '1.15'
macos_machine:
- x86_64-apple-darwin13.4.0
macos_min_version:
- '10.15'
pin_run_as_build:
graphviz:
max_pin: x
qt_main:
- '5.15'
target_platform:
- osx-64
tbb_devel:
- '2021'
tinyxml2:
- '10'
urdfdom:
- '4.0'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
GZ_CLI_NAME_VARIANT:
- origname
MACOSX_DEPLOYMENT_TARGET:
- '10.15'
assimp:
Expand Down
72 changes: 72 additions & 0 deletions .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
GZ_CLI_NAME_VARIANT:
- gzcompatname
MACOSX_DEPLOYMENT_TARGET:
- '11.0'
assimp:
- 5.3.1
bullet_cpp:
- '3.25'
bzip2:
- '1'
c_compiler:
- clang
c_compiler_version:
- '16'
c_stdlib:
- macosx_deployment_target
c_stdlib_version:
- '11.0'
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
curl:
- '8'
cxx_compiler:
- clangxx
cxx_compiler_version:
- '16'
ffmpeg:
- '6'
graphviz:
- '9'
hdf5:
- 1.14.3
libabseil:
- '20240116'
libblas:
- 3.9 *netlib
libboost_devel:
- '1.84'
libcblas:
- 3.9 *netlib
libcurl:
- '8'
libgdal:
- '3.8'
libode:
- 0.16.2
libprotobuf:
- 4.25.3
libxcb:
- '1.15'
macos_machine:
- arm64-apple-darwin20.0.0
pin_run_as_build:
graphviz:
max_pin: x
qt_main:
- '5.15'
target_platform:
- osx-arm64
tbb_devel:
- '2021'
tinyxml2:
- '10'
urdfdom:
- '4.0'
zip_keys:
- - c_compiler_version
- cxx_compiler_version
zlib:
- '1.2'
Loading

0 comments on commit 7f401f3

Please sign in to comment.