Bump requirements to C++17
This commit is contained in:
parent
dc357c780d
commit
89e9ce8aff
6 changed files with 9 additions and 12 deletions
|
@ -3,8 +3,6 @@ clone_depth: 5
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
matrix:
|
matrix:
|
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
|
||||||
cmake_generator: "Visual Studio 14 2015 Win64"
|
|
||||||
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||||
cmake_generator: "Visual Studio 15 2017 Win64"
|
cmake_generator: "Visual Studio 15 2017 Win64"
|
||||||
|
|
||||||
|
|
|
@ -10,9 +10,8 @@ matrix:
|
||||||
sources:
|
sources:
|
||||||
- ubuntu-toolchain-r-test
|
- ubuntu-toolchain-r-test
|
||||||
packages:
|
packages:
|
||||||
- gcc-6
|
- gcc-7
|
||||||
- g++-6
|
- g++-7
|
||||||
- lib32stdc++6 # For CMake
|
|
||||||
install: ./.travis/deps-x86_64-linux.sh
|
install: ./.travis/deps-x86_64-linux.sh
|
||||||
script: ./.travis/build-x86_64-linux.sh
|
script: ./.travis/build-x86_64-linux.sh
|
||||||
- os: osx
|
- os: osx
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
export CC=gcc-6
|
export CC=gcc-7
|
||||||
export CXX=g++-6
|
export CXX=g++-7
|
||||||
export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
|
export PKG_CONFIG_PATH=$HOME/.local/lib/pkgconfig:$PKG_CONFIG_PATH
|
||||||
|
|
||||||
mkdir build && cd build
|
mkdir build && cd build
|
||||||
|
|
|
@ -5,9 +5,9 @@ set -x
|
||||||
|
|
||||||
# TODO: This isn't ideal.
|
# TODO: This isn't ideal.
|
||||||
cd externals
|
cd externals
|
||||||
git clone https://github.com/citra-emu/ext-boost
|
git clone https://github.com/MerryMage/ext-boost
|
||||||
cd ..
|
cd ..
|
||||||
|
|
||||||
mkdir -p $HOME/.local
|
mkdir -p $HOME/.local
|
||||||
curl -L https://cmake.org/files/v3.4/cmake-3.4.1-Linux-i386.tar.gz \
|
curl -L https://cmake.org/files/v3.8/cmake-3.8.0-Linux-x86_64.tar.gz \
|
||||||
| tar -xz -C $HOME/.local --strip-components=1
|
| tar -xz -C $HOME/.local --strip-components=1
|
||||||
|
|
|
@ -5,5 +5,5 @@ set -x
|
||||||
|
|
||||||
# TODO: This isn't ideal.
|
# TODO: This isn't ideal.
|
||||||
cd externals
|
cd externals
|
||||||
git clone https://github.com/citra-emu/ext-boost
|
git clone https://github.com/MerryMage/ext-boost
|
||||||
cd ..
|
cd ..
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.2)
|
cmake_minimum_required(VERSION 3.8)
|
||||||
project(dynarmic CXX)
|
project(dynarmic CXX)
|
||||||
|
|
||||||
# Determine if we're built as a subproject (using add_subdirectory)
|
# Determine if we're built as a subproject (using add_subdirectory)
|
||||||
|
@ -21,7 +21,7 @@ if (NOT CMAKE_BUILD_TYPE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Set hard requirements for C++
|
# Set hard requirements for C++
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue