This commit is contained in:
Erik Frojdh 2019-06-13 10:44:45 +02:00
parent 32d951e28a
commit c8f56ee23c

View File

@ -1,4 +1,3 @@
package: package:
name: sls_detector_software name: sls_detector_software
version: 4.0.2 version: 4.0.2
@ -16,8 +15,7 @@ requirements:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{compiler('cxx')}} - {{compiler('cxx')}}
- cmake - cmake
# - qwt 6.* - qwt 6.1.4=hf484d3e_1001
# - qt=4.8.7
- zeromq=4.2.5=hfc679d8_5 - zeromq=4.2.5=hfc679d8_5
- pyzmq - pyzmq
- xorg-libx11 - xorg-libx11
@ -58,32 +56,30 @@ outputs:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{compiler('cxx')}} - {{compiler('cxx')}}
# - name: sls_detector_gui - name: sls_detector_gui
# version: 4.0.2rc version: 4.0.2
# script: copy_gui.sh script: copy_gui.sh
# requirements: requirements:
# build: build:
# - {{ compiler('c') }} - {{ compiler('c') }}
# - {{compiler('cxx')}} - {{compiler('cxx')}}
# - cmake - cmake
# - qwt 6.* - qwt 6.1.4=hf484d3e_1001
# - qt=4.8.7=7 - zeromq=4.2.5=hfc679d8_5
# - zeromq=4.2.5=hfc679d8_5 - pyzmq
# - pyzmq - xorg-libx11
# - xorg-libx11 - xorg-libice
# - xorg-libice - xorg-libxext
# - xorg-libxext - xorg-libsm
# - xorg-libsm - xorg-libxau
# - xorg-libxau - xorg-libxrender
# - xorg-libxrender - xorg-libxfixes
# - xorg-libxfixes - {{ cdt('mesa-libgl-devel') }} # [linux]
# - {{ cdt('mesa-libgl-devel') }} # [linux] - {{ cdt('mesa-libegl-devel') }} # [linux]
# - {{ cdt('mesa-libegl-devel') }} # [linux] - {{ cdt('mesa-dri-drivers') }} # [linux]
# - {{ cdt('mesa-dri-drivers') }} # [linux] - {{ cdt('libselinux') }} # [linux]
# - {{ cdt('libselinux') }} # [linux] - {{ cdt('libxdamage') }} # [linux]
# - {{ cdt('libxdamage') }} # [linux] - {{ cdt('libxxf86vm') }} # [linux]
# - {{ cdt('libxxf86vm') }} # [linux] run:
# run: - sls_detector_lib=4.0.2
# - sls_detector_lib=4.0.1 - qwt 6.1.4=hf484d3e_1001
# - qwt 6.*
# - qt=4.8.7=7