Merge pull request #1178 from slsdetectorgroup/main_910/conda_build_fix
Some checks failed
CMake / Configure and build using cmake (push) Failing after 9s

fixed conda build
This commit is contained in:
maliakal_d 2025-03-28 14:39:43 +01:00 committed by GitHub
commit 37b2efb1ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 15 additions and 25 deletions

View File

@ -1,4 +1,4 @@
SLS Detector Package Minor Release 9.1.0 released on 26.03.2025
SLS Detector Package Minor Release 9.1.0 released on 28.03.2025
===============================================================
This document describes the differences between v9.1.0 and v9.0.0

View File

@ -6,3 +6,9 @@ python:
- 3.12
- 3.13
c_stdlib:
- sysroot # [linux]
c_stdlib_version: # [linux]
- 2.17 # [linux]

View File

@ -15,36 +15,19 @@ build:
requirements:
build:
- {{ compiler('c') }}
- {{stdlib('c')}}
- {{compiler('cxx')}}
- cmake
- cmake<=3.28
- ninja
- qt 5.*
- xorg-libx11
- xorg-libice
- xorg-libxext
- xorg-libsm
- xorg-libxau
- xorg-libxrender
- xorg-libxfixes
- {{ cdt('mesa-libgl-devel') }} # [linux]
- {{ cdt('mesa-libegl-devel') }} # [linux]
- {{ cdt('mesa-dri-drivers') }} # [linux]
- {{ cdt('libselinux') }} # [linux]
- {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux]
- expat
host:
- libstdcxx-ng
- libgcc-ng
- xorg-libx11
- xorg-libice
- xorg-libxext
- xorg-libsm
- xorg-libxau
- xorg-libxrender
- xorg-libxfixes
- expat
- libgl-devel
- libtiff
- zlib
run:
- libstdcxx-ng
- libgcc-ng
@ -123,3 +106,4 @@ outputs:
run:
- {{ pin_subpackage('slsdetlib', exact=True) }}
- expat