diff --git a/lcftrans/CMakeLists.txt b/lcftrans/CMakeLists.txt index d0fab43..89102b9 100644 --- a/lcftrans/CMakeLists.txt +++ b/lcftrans/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.7) project(lcftrans VERSION 1.0 LANGUAGES CXX) -# C++14 is required -set(CMAKE_CXX_STANDARD 14) +# C++17 is required +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS ON) diff --git a/lcftrans/Makefile.am b/lcftrans/Makefile.am index 5566402..c5f3c22 100644 --- a/lcftrans/Makefile.am +++ b/lcftrans/Makefile.am @@ -10,7 +10,7 @@ lcftrans_SOURCES = \ src/utils.cpp \ src/utils.h lcftrans_CXXFLAGS = \ - -std=c++14 \ + -std=c++17 \ $(LCF_CFLAGS) lcftrans_LDADD = \ $(LCF_LIBS) diff --git a/lcfviz/CMakeLists.txt b/lcfviz/CMakeLists.txt index b890fb9..171c5a8 100644 --- a/lcfviz/CMakeLists.txt +++ b/lcfviz/CMakeLists.txt @@ -1,8 +1,8 @@ cmake_minimum_required(VERSION 3.7) project(lcfviz VERSION 1.0 LANGUAGES CXX) -# C++14 is required -set(CMAKE_CXX_STANDARD 14) +# C++17 is required +set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS ON) diff --git a/lcfviz/Makefile.am b/lcfviz/Makefile.am index 1211b64..9ffd5ab 100644 --- a/lcfviz/Makefile.am +++ b/lcfviz/Makefile.am @@ -5,7 +5,7 @@ lcfviz_SOURCES = \ src/utils.cpp \ src/utils.h lcfviz_CXXFLAGS = \ - -std=c++14 \ + -std=c++17 \ $(LCF_CFLAGS) lcfviz_LDADD = \ $(LCF_LIBS) diff --git a/lmu2png/CMakeLists.txt b/lmu2png/CMakeLists.txt index ad4de0a..4fea40c 100644 --- a/lmu2png/CMakeLists.txt +++ b/lmu2png/CMakeLists.txt @@ -1,6 +1,11 @@ cmake_minimum_required(VERSION 3.7) project(lmu2png VERSION 1.0 LANGUAGES CXX) +# C++17 is required +set(CMAKE_CXX_STANDARD 17) +set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(CMAKE_CXX_EXTENSIONS ON) + set(CMAKE_MODULE_PATH APPEND "${CMAKE_CURRENT_SOURCE_DIR}/../Modules") include(ConfigureWindows) @@ -16,7 +21,5 @@ add_executable(lmu2png target_link_libraries(lmu2png ZLIB::ZLIB SDL2::IMAGE liblcf::liblcf) -target_compile_features(lmu2png PRIVATE cxx_std_14) - include(GNUInstallDirs) install(TARGETS lmu2png RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/lmu2png/Makefile.am b/lmu2png/Makefile.am index 692f761..19eb8d8 100644 --- a/lmu2png/Makefile.am +++ b/lmu2png/Makefile.am @@ -6,7 +6,7 @@ lmu2png_SOURCES = \ src/sdlxyz.h \ src/chipset.h lmu2png_CXXFLAGS = \ - -std=c++14 \ + -std=c++17 \ $(LCF_CFLAGS) \ $(SDL2_IMAGE_CFLAGS) \ $(ZLIB_CFLAGS)