Skip to content

Commit 5539929

Browse files
committed
CMakeLists.txt: Minor changes to my build to reduce pull request
1 parent 9ecceff commit 5539929

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.2)
1+
cmake_minimum_required(VERSION 3.8)
22

33
option(BUILD_SHARED_LIBS "Enable compilation of shared libraries" FALSE)
44

@@ -33,12 +33,12 @@ else()
3333
-Wpedantic # warn if non-standard C++ is used
3434
-Wconversion # warn on type conversions that may lose data
3535
-Wsign-conversion # warn on sign conversions
36-
#-Wmisleading-indentation # warn if identation implies blocks where blocks do not exist
37-
#-Wduplicated-cond # warn if if / else chain has duplicated conditions
38-
#-Wduplicated-branches # warn if if / else branches have duplicated code
36+
-Wmisleading-indentation # warn if identation implies blocks where blocks do not exist
37+
-Wduplicated-cond # warn if if / else chain has duplicated conditions
38+
-Wduplicated-branches # warn if if / else branches have duplicated code
3939
-Wlogical-op # warn about logical operations being used where bitwise were
4040
# probably wanted
41-
#-Wnull-dereference # warn if a null dereference is detected
41+
-Wnull-dereference # warn if a null dereference is detected
4242
-Wuseless-cast # warn if you perform a cast to the same type
4343
-Wdouble-promotion # warn if float is implicit promoted to double
4444
-Wformat=2 # warn on security issues around functions that format output
@@ -47,7 +47,7 @@ else()
4747
endif()
4848

4949
add_executable(intro main.cpp)
50-
#target_compile_features(intro PRIVATE cxx_std_14)
50+
target_compile_features(intro PRIVATE cxx_std_17)
5151
target_link_libraries(intro PRIVATE project_warnings --coverage)
5252

5353
enable_testing()
@@ -95,7 +95,7 @@ target_link_libraries(test_imgui PRIVATE project_warnings imgui)
9595
target_include_directories(test_imgui PRIVATE ${SFML_INCLUDE_DIR})
9696
endif()
9797

98-
## Nana
98+
# Nana
9999
if( DEFINED CPP_STARTER_USE_NANA )
100100
include(ExternalProject)
101101
ExternalProject_add(

0 commit comments

Comments
 (0)