From 12c7d8f1c941e17add388d4fc93e5b91105d6593 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Thu, 8 Feb 2018 00:14:36 -0600 Subject: [PATCH] Fix to actually use C++14 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c45b3a6a..c1873dd4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,12 +24,16 @@ if(NOSTALGIA_BUILD_TYPE STREQUAL "GBA") endif() add_definitions( - -std=c++14 #-fdiagnostics-color # forces colored output when using ninja -Wall -Wsign-compare ) + +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS OFF) + if(NOSTALGIA_IDE_BUILD STREQUAL "ON") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})