diff --git a/.travis.yml b/.travis.yml index 46a8172c7a..fa04b58c6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -dist: xenial +dist: bionic language: cpp @@ -18,14 +18,15 @@ branches: addons: apt: &apt-global sources: &apt-common-sources - - ubuntu-toolchain-r-test - - llvm-toolchain-xenial-8 - - llvm-toolchain-xenial + - sourceline: 'ppa:ubuntu-toolchain-r/test' + - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-8 main' + - sourceline: 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic main' packages: &apt-common-packages - clang-8 - g++-9 - gcc-9 - gdb + - cmake #- cppcheck config: retries: true @@ -59,8 +60,8 @@ before_install: if [ "${CXX}" = 'clang++' ] && [ "${TRAVIS_OS_NAME}" != 'osx' ] && [ "${USE_COVERAGE}" = '' ]; then export CC=clang-8 export CXX=clang++-8 - #update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 90 - #update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 90 + #update-alternatives --install /usr/bin/clang clang /usr/bin/clang-8 90 + #update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-8 90 fi install: diff --git a/projects/cmake/CMakeLists.txt b/projects/cmake/CMakeLists.txt index c94160f441..f307157b2c 100644 --- a/projects/cmake/CMakeLists.txt +++ b/projects/cmake/CMakeLists.txt @@ -3,7 +3,7 @@ # # CMake バージョン -cmake_minimum_required(VERSION 3.0.2) +cmake_minimum_required(VERSION 3.14.7) # option option(build_gtest_samples "gtest sample build." OFF) @@ -24,6 +24,7 @@ endif() # プロジェクト名 project(iutest CXX C) +set(CMAKE_CXX_STANDARD 17) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE NEVER) set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE NEVER) diff --git a/projects/cmake/exsample.bat b/projects/cmake/example.bat similarity index 93% rename from projects/cmake/exsample.bat rename to projects/cmake/example.bat index e4f319aa4a..e03a37fd42 100644 --- a/projects/cmake/exsample.bat +++ b/projects/cmake/example.bat @@ -1,6 +1,6 @@ @echo off -SET VCVERSION=15 +SET VCVERSION=16 SET DIRNAME=vc%VCVERSION% pushd . diff --git a/projects/cmake/internal_utils.cmake b/projects/cmake/internal_utils.cmake index 4f95cec2e6..69ee06ea8c 100644 --- a/projects/cmake/internal_utils.cmake +++ b/projects/cmake/internal_utils.cmake @@ -5,7 +5,7 @@ macro(fix_default_compiler_settings_) if (MSVC) if(NOT (MSVC_VERSION LESS 1910)) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /permissive-") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /permissive-") endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") if (MSVC_VERSION LESS 1900)