diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index 46d80d3b..54eb8385 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -16,6 +16,14 @@ jobs: CONFIG: linux_64_OGRE_VERSION1.12 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_OGRE_VERSION1.10: + CONFIG: linux_aarch64_OGRE_VERSION1.10 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + linux_aarch64_OGRE_VERSION1.12: + CONFIG: linux_aarch64_OGRE_VERSION1.12 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 timeoutInMinutes: 360 steps: diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml new file mode 100644 index 00000000..0cad0b92 --- /dev/null +++ b/.ci_support/linux_aarch64_OGRE_VERSION1.10.yaml @@ -0,0 +1,64 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +OGRE_VERSION: +- '1.10' +boost_cpp: +- 1.74.0 +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '4.4' +graphviz: +- '3' +hdf5: +- 1.12.1 +libcurl: +- '7' +libgdal: +- '3.5' +libprotobuf: +- '3.20' +libuuid: +- '2' +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_main: +- '5.15' +target_platform: +- linux-aarch64 +tbb_devel: +- '2021' +tinyxml2: +- '9' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml new file mode 100644 index 00000000..31ad5b1b --- /dev/null +++ b/.ci_support/linux_aarch64_OGRE_VERSION1.12.yaml @@ -0,0 +1,64 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +OGRE_VERSION: +- '1.12' +boost_cpp: +- 1.74.0 +c_compiler: +- gcc +c_compiler_version: +- '10' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '7' +cxx_compiler: +- gxx +cxx_compiler_version: +- '10' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '4.4' +graphviz: +- '3' +hdf5: +- 1.12.1 +libcurl: +- '7' +libgdal: +- '3.5' +libprotobuf: +- '3.20' +libuuid: +- '2' +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_main: +- '5.15' +target_platform: +- linux-aarch64 +tbb_devel: +- '2021' +tinyxml2: +- '9' +zip_keys: +- - c_compiler_version + - cxx_compiler_version diff --git a/README.md b/README.md index 983aae2b..d9492e6f 100644 --- a/README.md +++ b/README.md @@ -40,6 +40,20 @@ Current build status variant + + linux_aarch64_OGRE_VERSION1.10 + + + variant + + + + linux_aarch64_OGRE_VERSION1.12 + + + variant + + osx_64_OGRE_VERSION1.10 diff --git a/conda-forge.yml b/conda-forge.yml index 1462cbfe..a9c3c51d 100644 --- a/conda-forge.yml +++ b/conda-forge.yml @@ -1,7 +1,10 @@ build_platform: osx_arm64: osx_64 + linux_aarch64: linux_64 conda_forge_output_validation: true github: branch_name: main tooling_branch_name: main test_on_native_only: true +provider: + linux_aarch64: default diff --git a/recipe/build.sh b/recipe/build.sh index 9d1b727d..e3bc85b4 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -13,6 +13,7 @@ if [[ "$CONDA_BUILD_CROSS_COMPILATION" == 1 ]]; then unset CXXFLAGS cmake .. \ + -G "Ninja" \ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_PREFIX_PATH=$BUILD_PREFIX -DCMAKE_INSTALL_PREFIX=$BUILD_PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \