Merge 227413f into 9a85028

.ci/travisci/install-gtest.sh

@@ -5,18 +5,22 @@ set -e
 if [ "${USE_GTEST_HEAD}" = '1' ]; then
   git clone https://github.com/google/googletest.git googletest
 else
-  mkdir googletest
-  if [ -e /usr/src/gtest ]; then
-    cp -r /usr/src/gtest googletest
-  elif [ -e /usr/src/gmock/gtest ]; then
-    cp -r /usr/src/gmock/gtest googletest
+  if [ -e /usr/src/googletest ]; then
+    cp -r /usr/src/googletest googletest
   else
-    exit 1
+    mkdir googletest
+    if [ -e /usr/src/gtest ]; then
+      cp -r /usr/src/gtest googletest
+    elif [ -e /usr/src/gmock/gtest ]; then
+      cp -r /usr/src/gmock/gtest googletest
+    else
+      exit 1
+    fi
+    mv googletest/gtest googletest/googletest
+    cd googletest
+    ln -s googletest gtest
+    cd -
   fi
-  mv googletest/gtest googletest/googletest
-  cd googletest
-  ln -s googletest gtest
-  cd -
 fi
 
 cd googletest/googletest

.semaphore/semaphore.yml

@@ -14,7 +14,7 @@ auto_cancel:
 global_job_config:
   env_vars:
     - name: CLANG_VERSION
-      value: "7"
+      value: "9"
     - name: UBNAME
       value: bionic
   prologue:

.travis.yml

@@ -1,4 +1,4 @@
-dist: xenial
+dist: bionic
 
 language: cpp
 
@@ -18,9 +18,9 @@ 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
@@ -59,8 +59,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:

projects/cmake/CMakeLists.txt

@@ -3,7 +3,7 @@
 #
 
 # CMake バージョン
-cmake_minimum_required(VERSION 3.0.2)
+cmake_minimum_required(VERSION 3.2)
 
 # 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)

projects/cmake/exsample.bat → projects/cmake/example.bat

@@ -1,6 +1,6 @@
 @echo off
 
-SET VCVERSION=15
+SET VCVERSION=16
 SET DIRNAME=vc%VCVERSION%
 
 pushd .

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)