clang 7.0 support - individual warning levels

.travis.yml

@@ -26,6 +26,7 @@
 ####################################################################################
 
 language: cpp
+dist: trusty
 sudo: false
 
 env:
@@ -38,19 +39,20 @@ env:
 
 matrix:
   include:
-    # check code formatting
+
+     # check code formatting
     - os: linux
       compiler: gcc
-      env: NAME="check code formatting" COMPILER=g++-4.8 ARCH=x86_64 CHECK_FORMATTING=true UNIT_TESTS=false
-
+      env: NAME="check code formatting" CHECK_FORMATTING=true 
+      
     # valgrind memory check
     - os: linux
       compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib', 'linux-libc-dev:i386', 'libc6-dbg:i386', 'valgrind']
-      env: NAME="valgrind" COMPILER=g++-4.8 ARCH=x86 CONF=Debug VALGRIND=true UNIT_TESTS=true
+          packages: ['g++-4.9', 'valgrind', 'ninja-build']
+      env: NAME="valgrind" COMPILER=g++-4.9 ARCH=x64 CONF=Debug VALGRIND=true UNIT_TESTS=true
 
     # check code coverage x86 => result https://coveralls.io/github/rttrorg/rttr
     - os: linux
@@ -100,99 +102,124 @@ matrix:
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib', 'linux-libc-dev:i386']
-      env: COMPILER=g++-4.8 ARCH=x86 CONF=Release UNIT_TESTS=true
+          packages: ['g++-4.9-multilib', 'linux-libc-dev:i386', 'ninja-build']
+      env: NAME="g++-4.9 x86" COMPILER=g++-4.9 ARCH=x86 CONF=Release UNIT_TESTS=true
 
     - os: linux
       compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib']
-      env: COMPILER=g++-4.8 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+          packages: ['g++-4.9', 'ninja-build']
+      env: NAME="g++-4.9 x64" COMPILER=g++-4.9 ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
     - os: linux
       compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-7']
-      env: COMPILER=g++-7 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+          packages: ['g++-4.9', 'libboost-all-dev']
+      env: NAME="g++-4.9 x64 - Build benchmarks & examples" COMPILER=g++-4.9 ARCH=x86_64 CONF=Release UNIT_TESTS=false BUILD_EXAMPLES=true BUILD_BENCHMARKS=true
 
     - os: linux
       compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib', 'libboost-all-dev']
-      env: COMPILER=g++-4.8 ARCH=x86_64 CONF=Release UNIT_TESTS=false BUILD_EXAMPLES=true BUILD_BENCHMARKS=true
-
+          packages: ['g++-5', 'ninja-build']
+      env: NAME="g++-5" COMPILER=g++-5 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+      
     - os: linux
-      compiler: clang
+      compiler: gcc
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib', 'libboost-all-dev']
-      env: LLVM_VERSION=3.8.0 ARCH=x86_64 CONF=Release UNIT_TESTS=false BUILD_EXAMPLES=true BUILD_BENCHMARKS=true
-
+          packages: ['g++-6', 'ninja-build']
+      env: NAME="g++-6" COMPILER=g++-6 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+
+    - os: linux
+      compiler: gcc
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test']
+          packages: ['g++-7', 'libboost-all-dev', 'ninja-build']
+      env: NAME="g++-7" COMPILER=g++-7 ARCH=x86_64 CONF=Release UNIT_TESTS=true BUILD_BENCHMARKS=true
+
     # Linux / CLang
-    # this config fails at the moment because of disabled APT on llvm
     - os: linux
       compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
-          packages: ['clang-3.7']
+          packages: ['libstdc++-5-dev', 'clang-3.7', 'ninja-build']
       env: COMPILER=clang++-3.7 ARCH=x86_64 CONF=Release UNIT_TESTS=true
-    # end not workint clang config
-
+
     - os: linux
       compiler: clang
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib', 'linux-libc-dev:i386']
-      env: LLVM_VERSION=3.7.1 ARCH=x86 CONF=Release UNIT_TESTS=true
-
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
+          packages: ['libstdc++-6-dev', 'clang-4.0', 'libboost-all-dev', 'ninja-build']
+      env: NAME="clang++-4.0 - build benchmarks & examples" COMPILER=clang++-4.0 ARCH=x86_64 CONF=Release UNIT_TESTS=false BUILD_EXAMPLES=true BUILD_BENCHMARKS=true
+      
     - os: linux
       compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib']
-      env: LLVM_VERSION=3.7.1 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+          packages: ['libstdc++-5-dev', 'clang-3.8', 'ninja-build']
+      env: COMPILER=clang++-3.8 ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
     - os: linux
       compiler: clang
       addons:
         apt:
           sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib', 'linux-libc-dev:i386']
-      env: LLVM_VERSION=3.8.0 ARCH=x86 CONF=Release UNIT_TESTS=true
-
+          packages: ['libstdc++-6-dev', 'clang-3.9', 'ninja-build']
+      env: COMPILER=clang++-3.9 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+      
     - os: linux
       compiler: clang
       addons:
         apt:
-          sources: ['ubuntu-toolchain-r-test']
-          packages: ['g++-4.8-multilib']
-      env: LLVM_VERSION=3.8.0 ARCH=x86_64 CONF=Release UNIT_TESTS=true
-
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
+          packages: ['libstdc++-6-dev', 'clang-4.0', 'ninja-build']
+      env: COMPILER=clang++-4.0 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+
+    - os: linux
+      compiler: clang
+      addons:
+        apt:
+          sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
+          packages: ['libstdc++-7-dev', 'clang-5.0',]
+      env: COMPILER=clang++-5.0 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+
     # OSX/Clang
     - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode9.2
       compiler: clang
-      env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true
+      env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true BUILD_BENCHMARKS=true
 
     - os: osx
-      osx_image: xcode7.3
+      osx_image: xcode9.2
       compiler: clang
-      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true      
+      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
-  allow_failures:
-    - env: COMPILER=clang++-3.7 ARCH=x86_64 CONF=Release UNIT_TESTS=true
-    - env: COMPILER=g++-7 ARCH=x86_64 CONF=Release UNIT_TESTS=true
+    - os: osx
+      osx_image: xcode9
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
 
+    - os: osx
+      osx_image: xcode8.3
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86 CONF=Release UNIT_TESTS=true
+
+    - os: osx
+      osx_image: xcode8.3
+      compiler: clang
+      env: COMPILER=clang++ ARCH=x86_64 CONF=Release UNIT_TESTS=true
+
 before_install:
   - export CIT_ROOT=`pwd`
   - cd $CIT_ROOT
@@ -212,11 +239,11 @@ install:
   #######################################################################################
   - |
     if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then
-      CMAKE_URL="http://www.cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.tar.gz"
+      CMAKE_URL="http://www.cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz"
       mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
       export PATH=${DEPS_DIR}/cmake/bin:${PATH}
     else
-      brew upgrade cmake || brew install cmake || brew link --overwrite cmake
+      brew upgrade cmake || brew install cmake ninja || brew link --overwrite cmake
     fi
   - cmake --version
   #######################################################################################
@@ -235,69 +262,25 @@ install:
     if [[ "${CHECK_FORMATTING}" == "true" ]]; then
       sudo apt-get install vera++ -y
     fi
-
-  #######################################################################################
-  # Install Clang
-  #######################################################################################
-  - |
-    if [[ "${LLVM_VERSION}" != "" ]]; then
-      CLANG_URL="http://llvm.org/releases/${LLVM_VERSION}/clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-ubuntu-14.04.tar.xz"
-      mkdir clang && travis_retry wget --quiet -O - ${CLANG_URL} | tar --strip-components=1 -xJ -C clang
-      export PATH=${DEPS_DIR}/clang/bin:${PATH}
-      ls ${DEPS_DIR}/clang/bin
-      export CXX=${DEPS_DIR}/clang/bin/clang++
-      export CC=${DEPS_DIR}/clang/bin/clang
-    fi
-
-  #######################################################################################
-  # Install libc++ and libc++abi (on Linux only; Xcode uses libc++ by default)
-  #######################################################################################
-  - |
-    if [[ "${LLVM_VERSION}" != "" && "${STDLIB}" != "libstdc++" ]]; then
-      if [[ "${LLVM_VERSION}" != "trunk" ]]; then
-        LLVM_URL="http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz"
-        LIBCXX_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxx-${LLVM_VERSION}.src.tar.xz"
-        LIBCXXABI_URL="http://llvm.org/releases/${LLVM_VERSION}/libcxxabi-${LLVM_VERSION}.src.tar.xz"
-        TAR_FLAGS="-xJ"
-      else
-        LLVM_URL="https://github.com/llvm-mirror/llvm/archive/master.tar.gz"
-        LIBCXX_URL="https://github.com/llvm-mirror/libcxx/archive/master.tar.gz"
-        LIBCXXABI_URL="https://github.com/llvm-mirror/libcxxabi/archive/master.tar.gz"
-        TAR_FLAGS="-xz"
-      fi
-      mkdir -p llvm llvm/build llvm/projects/libcxx llvm/projects/libcxxabi
-      travis_retry wget --quiet -O - ${LLVM_URL} | tar --strip-components=1 ${TAR_FLAGS} -C llvm
-      travis_retry wget --quiet -O - ${LIBCXX_URL} | tar --strip-components=1 ${TAR_FLAGS} -C llvm/projects/libcxx
-      travis_retry wget --quiet -O - ${LIBCXXABI_URL} | tar --strip-components=1 ${TAR_FLAGS} -C llvm/projects/libcxxabi
-      # clang-3.8.0 does not compile libc++.so.1.0 as 32 bit binary, the flag is for unknown reason not forwarded
-      # this will fix it
-      export CXX="${DEPS_DIR}/clang/bin/clang++ $CMAKE_ARCH_FLAGS"
-      (cd llvm/build && cmake .. -DCMAKE_INSTALL_PREFIX=${DEPS_DIR}/llvm/install -DCMAKE_CXX_FLAGS="$CMAKE_ARCH_FLAGS")
-      (cd llvm/build/projects/libcxx && make install -j2)
-      (cd llvm/build/projects/libcxxabi && make install -j2)
-      export CXXFLAGS="-isystem ${DEPS_DIR}/llvm/install/include/c++/v1"
-      export LDFLAGS="-L ${DEPS_DIR}/llvm/install/lib -l c++ -l c++abi"
-      export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${DEPS_DIR}/llvm/install/lib"
-    fi
 
 before_script:
   - cd ${TRAVIS_BUILD_DIR}
   - mkdir build
-  - if [[ "${LLVM_VERSION}" != "" ]]; then export CMAKE_ADDITIONAL_FLAGS=-stdlib=libc++; fi
   - >
       eval "ARCH_FLAGS=\${ARCH_FLAGS_${ARCH}}" ;
       (cd build && cmake
       -DCMAKE_CXX_COMPILER=${COMPILER}
-      -DCMAKE_C_COMPILER=${CC}
       -DCMAKE_BUILD_TYPE=${CONF}
       -DCMAKE_CXX_FLAGS="$ARCH_FLAGS $CMAKE_ADDITIONAL_FLAGS $GCOV_FLAGS"
-      -DCMAKE_C_FLAGS="$ARCH_FLAGS"
       -DBUILD_WEBSITE_DOCU=$BUILD_DOCU
       -DBUILD_EXAMPLES=$BUILD_EXAMPLES
       -DBUILD_BENCHMARKS=$BUILD_BENCHMARKS
       ..)
 
 script:
+  # show OS/compiler version
+  - uname -a
+  - $CXX --version
   - |
     if [[ "${CHECK_FORMATTING}" == "true" ]]; then
       # F001: Source files should not use the '\r' (CR) character

CMake/config.cmake

@@ -113,41 +113,17 @@ endif()
 
 enable_rtti(BUILD_WITH_RTTI)
 
-if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.7.0")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Wall -Werror")
-    message(STATUS "added flag -std=c++0x, -Wall, -Werror to g++")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
-    message(STATUS "added flag -std=c++11, -Wall, -Werror to g++")
-  endif()
-  if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "4.0.0")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-  endif()
-
-  if(MINGW)
-    set(GNU_STATIC_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
-  else()
-    set(GNU_STATIC_LINKER_FLAGS "-static-libgcc -static-libstdc++")
-  endif()
-endif()
-
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wall -Werror")
-  message(STATUS "added flag -std=c++11, -Wall, -Werror to g++")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden -fvisibility-inlines-hidden")
-  message(WARNING "clang support is currently experimental")
-
-  set(CLANG_STATIC_LINKER_FLAGS "-stdlib=libc++ -static-libstdc++")
-endif()
+get_latest_supported_cxx(CXX_STANDARD)
+set(MAX_CXX_STANDARD ${CXX_STANDARD})
 
 if(MSVC)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj /WX")
-    replaceCompilerOption("/W3" "/W4")
-    message(STATUS "added flag /bigobj, /W4 to MSVC compiler")
-    message(STATUS "Treats all compiler warnings as errors.")
+    if (${CXX_STANDARD} EQUAL 17 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.12.25835.0")
+        set(MAX_CXX_STANDARD 14) # downgrade, because RTTR does not compile with this flag (template error)
+    endif()
 endif()
 
+message(STATUS "using C++: ${MAX_CXX_STANDARD}")
+
 # RelWithDepInfo should have the same option like the Release build
 # but of course with Debug informations
 if(MSVC)
@@ -163,6 +139,25 @@ else()
   message(WARNING "Please adjust CMAKE_CXX_FLAGS_RELWITHDEBINFO flags for this compiler!")
 endif()
 
+if(MSVC)
+    # we have to remove the default warning level,
+    # otherwise we get ugly compiler warnings, because of later replacing 
+    # option /W3 with /W4 (which will be later added)
+    replace_compiler_option("/W3" " ") 
+    if (BUILD_WITH_STATIC_RUNTIME_LIBS)
+        replace_compiler_option("/MD" " ")
+    endif()
+
+elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    if(MINGW)
+        set(GNU_STATIC_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
+    else()
+        set(GNU_STATIC_LINKER_FLAGS "-static-libgcc -static-libstdc++")
+    endif()
+elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CLANG_STATIC_LINKER_FLAGS "-stdlib=libc++ -static-libstdc++")
+endif()
+
 include(CMakePackageConfigHelpers)
 write_basic_package_version_file(
   "${CMAKE_CURRENT_BINARY_DIR}/CMake/rttr-config-version.cmake"