Merge branch 'develop' into 'master'

resolve #1

Closes #1

See merge request !1

.gitlab-ci.yml

+variables:
+  debian9_image_name: gitlab.desy.de:5555/yuelong.yu/docker-image-debian9/debian9:latest
+  debian10_image_name: gitlab.desy.de:5555/yuelong.yu/docker-image-debian10/debian10:latest
+
+stages:
+  - build
+  - test
+  - deploy
+
+.build_scripts: &build_scripts
+  script:
+    - apt install -y libusb-1.0-0-dev
+    - apt download siso550-devel siso550
+    - dpkg -i --force-all ./siso550*.deb
+    - source .gitlab/build.sh
+
+build on debian 9:
+  stage: build
+  image: $debian9_image_name
+  tags:         
+    - DESY-intern
+  <<: *build_scripts
+
+build on debian 10:
+  stage: build
+  image: $debian10_image_name
+  tags:         
+    - DESY-intern
+  <<: *build_scripts
+
+build package debian 9:
+  stage: deploy
+  only: 
+    - master
+    - tags
+  variables:
+    UPSTREAM_IMAGENAME: $debian9_image_name
+    UPSTREAM_DIST: debian9
+    UPSTREAM_BRANCH: $CI_COMMIT_REF_NAME
+    UPSTREAM_HASH: $CI_COMMIT_SHORT_SHA
+
+  trigger: detectorsoftware/pcosdk-deploy
+
+build package debian 10:
+  stage: deploy
+  only: 
+    - master
+    - tags
+  variables:
+    UPSTREAM_IMAGENAME: $debian10_image_name
+    UPSTREAM_DIST: debian10
+    UPSTREAM_BRANCH: $CI_COMMIT_REF_NAME
+    UPSTREAM_HASH: $CI_COMMIT_SHORT_SHA
+
+  trigger: detectorsoftware/pcosdk-deploy
\ No newline at end of file

.gitlab/build.sh

+#!/bin/bash
+# author : Yuelong Yu
+
+SOURCE_ROOT=$PWD
+mkdir -p report
+echo "=create build folder="
+mkdir -p build && cd build
+echo "=start build="
+cmake -DCMAKE_INSTALL_PREFIX="/lib.local/" -DCMAKE_BUILD_TYPE=DEBUG "$SOURCE_ROOT"
+make -j4
+echo "=run test="
+ctest --verbose
+echo "=install="
+make install
+cd "$SOURCE_ROOT"
\ No newline at end of file

api/Version.h

@@ -24,5 +24,5 @@
 
 namespace PcoNS
 {
-    const std::string PCOSDK_VERSION="0.6";
+    const std::string PCOSDK_VERSION="0.7";
 }

cmake/FindSISO.cmake

@@ -3,8 +3,8 @@ find_path(SISO_INC_DIRS NAMES clser.h
   PATHS
   /usr/include
   /usr/local/include
-  /opt/SiliconSoftware/Runtime5.6.0/include
-  /home/yuelong/lib.local/include/siso560
+  /opt/SiliconSoftware/Runtime5.5.0/include
+  /home/yuelong/lib.local/include/siso550
   )
 
 #path of pco path
@@ -12,8 +12,8 @@ find_library(SISO_LIB_DIRS NAMES fglib5
   PATHS
   /usr/lib/
   /usr/local/lib
-  /opt/SiliconSoftware/Runtime5.6.0/lib
-  /home/yuelong/lib.local/lib/siso560
+  /opt/SiliconSoftware/Runtime5.5.0/lib
+  /home/yuelong/lib.local/lib/siso550
   )
 
 if(SISO_INC_DIRS AND SISO_LIB_DIRS)