diff options
| author |  Yuri Kunde Schlesner | 2014-12-15 22:06:03 -0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner | 2014-12-16 01:08:14 -0200 |
| commit | 731b31fe972be473500db3a130aab79ba21a0c08 (patch) | |
| tree | 703c0580d22922056ce662c67124e40a6f517e61 | |
| parent | Travis: Use gcc 4.9 instead of 4.8 since it's getting installed anyway (diff) | |
| download | yuzu-731b31fe972be473500db3a130aab79ba21a0c08.tar.gz yuzu-731b31fe972be473500db3a130aab79ba21a0c08.tar.xz yuzu-731b31fe972be473500db3a130aab79ba21a0c08.zip | |
Switch to C++14 to use std::make_unique
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 61d5d524a..63738b5ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -5,7 +5,8 @@ cmake_minimum_required(VERSION 2.8.11) | |||
| 5 | project(citra) | 5 | project(citra) |
| 6 | 6 | ||
| 7 | if (NOT MSVC) | 7 | if (NOT MSVC) |
| 8 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Wno-attributes") | 8 | # -std=c++14 is only supported on very new compilers, so use the old c++1y alias instead. |
| 9 | set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y -Wno-attributes") | ||
| 9 | else() | 10 | else() |
| 10 | # Silence deprecation warnings | 11 | # Silence deprecation warnings |
| 11 | add_definitions(/D_CRT_SECURE_NO_WARNINGS) | 12 | add_definitions(/D_CRT_SECURE_NO_WARNINGS) |