merge from 4.0.1

This commit is contained in:
2019-02-11 14:37:54 +01:00
68 changed files with 6174 additions and 2231 deletions

View File

@@ -1,7 +1,7 @@
package:
name: sls_detector_software
version: 4.0.1
version: "developer"
source:
- path: ..
@@ -52,14 +52,14 @@ requirements:
outputs:
- name: sls_detector_lib
version: 4.0.1
version: "developer"
script: copy_lib.sh
requirements:
build:
- {{ compiler('c') }}
- {{compiler('cxx')}}
- name: sls_detector_gui
version: 4.0.1
version: "developer"
script: copy_gui.sh
requirements:
build:
@@ -84,6 +84,6 @@ outputs:
- {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux]
run:
- sls_detector_lib=4.0.1
- sls_detector_lib=developer
- qwt 6.*
- qt=4.8.7=7