Merge branch '4.0.2-rc' of github.com:slsdetectorgroup/slsDetectorPackage into 4.0.2-rc

This commit is contained in:
maliakal_d 2019-04-08 18:06:19 +02:00
commit 2108bbda66

View File

@ -1,7 +1,7 @@
package: package:
name: sls_detector_software name: sls_detector_software
version: 4.0.1 version: 4.0.2rc
source: source:
- path: .. - path: ..
@ -52,14 +52,14 @@ requirements:
outputs: outputs:
- name: sls_detector_lib - name: sls_detector_lib
version: 4.0.1 version: 4.0.2rc
script: copy_lib.sh script: copy_lib.sh
requirements: requirements:
build: build:
- {{ compiler('c') }} - {{ compiler('c') }}
- {{compiler('cxx')}} - {{compiler('cxx')}}
- name: sls_detector_gui - name: sls_detector_gui
version: 4.0.1 version: 4.0.2rc
script: copy_gui.sh script: copy_gui.sh
requirements: requirements:
build: build: