Skip to content

Enable C++17 #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 20, 2023
Merged

Enable C++17 #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lcftrans/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion lcftrans/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions lcfviz/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion lcfviz/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 5 additions & 2 deletions lmu2png/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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})
2 changes: 1 addition & 1 deletion lmu2png/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down