CI: restore debT_clang (needs g++ for libstdc++)

.gitlab-ci.yml

@@ -5,11 +5,13 @@ debS_clang:
   tags: &unix
   - Linux
   image: debian:stable
-  before_script: &debian_clang
+  before_script:
     - apt-get -y update
     - apt-get -y upgrade
-    - apt-get -y install cmake perl qtbase5-dev
+    - apt-get -y install cmake
     - apt-get -y install clang
+    - apt-get -y install qtbase5-dev
+    - export CC=clang; export CXX=clang++
   stage: build
   script: &scr
     - mkdir build
@@ -24,15 +26,22 @@ debS_gcc:
   before_script: &debian_gcc
     - apt-get -y update
     - apt-get -y upgrade
-    - apt-get -y install cmake perl qtbase5-dev
+    - apt-get -y install cmake
     - apt-get -y install g++
+    - apt-get -y install qtbase5-dev
   stage: build
   script: *scr
 
 debT_clang:
   tags: *unix
   image: debian:testing
-  before_script: *debian_gcc
+  before_script:
+    - apt-get -y update
+    - apt-get -y upgrade
+    - apt-get -y install cmake
+    - apt-get -y install clang g++
+    - apt-get -y install qtbase5-dev
+    - export CC=clang; export CXX=clang++
   stage: build
   script: *scr
 
@@ -42,8 +51,6 @@ debT_gcc:
   before_script: *debian_gcc
   stage: build
   script: *scr
-#disabled 27jan19: could not find libEGL.
-#- reported as Debian bug 949960.
 
 # debU_clang:
 #   tags: *unix
@@ -80,12 +87,12 @@ suse_clang:
     - zypper patch || echo "do it again"
     - zypper patch
     - zypper refresh
-    - zypper update -n
+    - zypper -n update
     - zypper dist-upgrade -y
-    - zypper install -n -y cmake perl
-    - zypper install -n -y libqt5-qtbase-devel
+    - zypper install -n -y cmake
     - zypper install -n -y clang libstdc++-devel
-    - export CXX=/usr/bin/clang++
+    - zypper install -n -y libqt5-qtbase-devel
+    - export CC=clang; export CXX=clang++
   stage: build
   script: *scr
 
@@ -97,11 +104,11 @@ suse_gcc:
     - zypper patch || echo "do it again"
     - zypper patch
     - zypper refresh
-    - zypper update -n
+    - zypper -n update
     - zypper dist-upgrade -y
-    - zypper install -n -y cmake perl
-    - zypper install -n -y libqt5-qtbase-devel
+    - zypper install -n -y cmake
     - zypper install -n -y gcc-c++
+    - zypper install -n -y libqt5-qtbase-devel
   stage: build
   script: *scr
 
@@ -112,8 +119,9 @@ centos8_clang:
     - yum -y update
     - yum -y install epel-release
     - yum repolist
-    - yum -y install make cmake perl qt5-qtbase-devel
+    - yum -y install make cmake
     - yum -y install clang gcc libstdc++-devel
+    - yum -y install qt5-qtbase-devel
     - export CXX=/usr/bin/clang++
     - ldconfig
     - cmake --version

CMakeLists.txt

@@ -35,7 +35,7 @@ if(MSVC)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
     set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$<CONFIG>)
 else()
-    if(Clang)
+    if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fshow-overloads=best")
     endif()
     set(DEB_FLAGS "-Wall -Wpedantic -Wno-sign-compare -fno-omit-frame-pointer -fsanitize=address")