removed need for split compilation for static analysis, we've gone from openmw taking 30 minutes to taking 3. Merging them also makes our before_script.linux.sh less complicated; removed redundant CMAKE flag; set build type to RelWithDebInfo as None has no meaning (even if it still builds).

.travis.yml

@@ -41,26 +41,16 @@ matrix:
       os: osx
       osx_image: xcode10.2
       if: branch != coverity_scan
-    - name: OpenMW (all) on Ubuntu Focal GCC-9
+    - name: OpenMW (all) on Ubuntu Focal with GCC
       os: linux
       dist: focal
       if: branch != coverity_scan
-    - name: OpenMW (openmw) on Ubuntu Focal Clang-10 with Static Analysis
+    - name: OpenMW (openmw) on Ubuntu Focal with Clang's Static Analysis
       os: linux
       dist: focal
       env:
         - MATRIX_EVAL="CC=clang && CXX=clang++"
         - ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
-        - BUILD_OPENMW_CS="OFF"
-      if: branch != coverity_scan
-      compiler: clang
-    - name: OpenMW (openmw-cs and tools) on Ubuntu Focal Clang-10 with Static Analysis
-      os: linux
-      dist: focal
-      env:
-        - MATRIX_EVAL="CC=clang && CXX=clang++"
-        - ANALYZE="scan-build --force-analyze-debug-code --use-cc clang --use-c++ clang++"
-        - BUILD_OPENMW="OFF"
       if: branch != coverity_scan
       compiler: clang
     - name: OpenMW Components Coverity Scan

CI/before_script.linux.sh

@@ -8,29 +8,16 @@ GOOGLETEST_DIR="$(pwd)/googletest/build"
 mkdir build
 cd build
 
-if [[ -z "${BUILD_OPENMW}" ]]; then export BUILD_OPENMW=ON; fi
-if [[ -z "${BUILD_OPENMW_CS}" ]]; then export BUILD_OPENMW_CS=ON; fi
-
 ${ANALYZE} cmake \
     -DCMAKE_C_COMPILER="${CC}" \
     -DCMAKE_CXX_COMPILER="${CXX}" \
     -DCMAKE_C_COMPILER_LAUNCHER=ccache \
     -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
-    -DBUILD_OPENMW=${BUILD_OPENMW} \
-    -DBUILD_OPENCS=${BUILD_OPENMW_CS} \
-    -DBUILD_LAUNCHER=${BUILD_OPENMW_CS} \
-    -DBUILD_BSATOOL=${BUILD_OPENMW_CS} \
-    -DBUILD_ESMTOOL=${BUILD_OPENMW_CS} \
-    -DBUILD_MWINIIMPORTER=${BUILD_OPENMW_CS} \
-    -DBUILD_ESSIMPORTER=${BUILD_OPENMW_CS} \
-    -DBUILD_WIZARD=${BUILD_OPENMW_CS} \
-    -DBUILD_NIFTEST=${BUILD_OPENMW_CS} \
-    -DBUILD_UNITTESTS=1 \
-    -DUSE_SYSTEM_TINYXML=1 \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DBINDIR=/usr/games \
-    -DCMAKE_BUILD_TYPE="None" \
+    -DBUILD_UNITTESTS=TRUE \
     -DUSE_SYSTEM_TINYXML=TRUE \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DBINDIR="/usr/games" \
+    -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
     -DGTEST_ROOT="${GOOGLETEST_DIR}" \
     -DGMOCK_ROOT="${GOOGLETEST_DIR}" \
     ..