Merge branch 'master' of jollyj.ep1.rub.de:jreher/apdbatchsetter

.gitlab-ci.yml

@@ -2,7 +2,7 @@
 # use the official gcc image, based on debian
 # can use verions as well, like gcc:5.2
 # see https://hub.docker.com/_/gcc/
-image: gcc
+image: msrd0/cmake-qt5
 
 build:
   stage: build
@@ -10,10 +10,11 @@ build:
   # install the necessary build tools when needed
   # before_script:
   #   - apt update && apt -y install make autoconf
+
   script:
     - mkdir build
     - cd build
-    - cmake ..
+    - cmake3 -DCMAKE_C_COMPILER=/usr/local/bin/gcc -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ ..
     - make
 #  artifacts:
 #    paths: