Merge branch 'clang_parallel' into 'master'

Clang parallel

Change CI settings to get build times for OpenFlipper with clang below 10 minutes

See merge request !56

.gitlab-ci.yml

@@ -7,6 +7,7 @@ clang-c++11-Qt4:
   script: "CI/ci-linux.sh clang C++11 QT4"
   tags:
     - Linux
+    - MultiThreads
 
 gcc-c++98-Qt4:
   script: "CI/ci-linux.sh gcc C++98 QT4"
@@ -17,6 +18,7 @@ clang-c++98-Qt4:
   script: "CI/ci-linux.sh clang C++98 QT4"
   tags: 
     - Linux
+    - MultiThreads
 
 gcc-c++11-Qt5:
   script: "CI/ci-linux.sh gcc C++11 QT5"
@@ -27,6 +29,7 @@ clang-c++11-Qt5:
   script: "CI/ci-linux.sh clang C++11 QT5"
   tags:
     - Linux
+    - MultiThreads
 
 gcc-c++98-Qt5:
   script: "CI/ci-linux.sh gcc C++98 QT5"
@@ -37,3 +40,4 @@ clang-c++98-Qt5:
   script: "CI/ci-linux.sh clang C++98 QT5"
   tags: 
     - Linux
+    - MultiThreads

CI/ci-linux.sh

@@ -30,6 +30,8 @@ elif [ "$COMPILER" == "clang" ]; then
 #  export ICECC_CXX=/usr/bin/clang++ ; export ICECC_CC=/usr/bin/clang
 
   BUILDPATH="clang"
+  MAKE_OPTIONS="-j6"
+
   echo "Building with CLANG";
 fi