|
1 | | -cmake_minimum_required(VERSION 3.2) |
| 1 | +cmake_minimum_required(VERSION 3.8) |
2 | 2 |
|
3 | 3 | option(BUILD_SHARED_LIBS "Enable compilation of shared libraries" FALSE) |
4 | 4 |
|
@@ -33,12 +33,12 @@ else() |
33 | 33 | -Wpedantic # warn if non-standard C++ is used |
34 | 34 | -Wconversion # warn on type conversions that may lose data |
35 | 35 | -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 |
39 | 39 | -Wlogical-op # warn about logical operations being used where bitwise were |
40 | 40 | # probably wanted |
41 | | - #-Wnull-dereference # warn if a null dereference is detected |
| 41 | + -Wnull-dereference # warn if a null dereference is detected |
42 | 42 | -Wuseless-cast # warn if you perform a cast to the same type |
43 | 43 | -Wdouble-promotion # warn if float is implicit promoted to double |
44 | 44 | -Wformat=2 # warn on security issues around functions that format output |
|
47 | 47 | endif() |
48 | 48 |
|
49 | 49 | add_executable(intro main.cpp) |
50 | | -#target_compile_features(intro PRIVATE cxx_std_14) |
| 50 | +target_compile_features(intro PRIVATE cxx_std_17) |
51 | 51 | target_link_libraries(intro PRIVATE project_warnings --coverage) |
52 | 52 |
|
53 | 53 | enable_testing() |
@@ -95,7 +95,7 @@ target_link_libraries(test_imgui PRIVATE project_warnings imgui) |
95 | 95 | target_include_directories(test_imgui PRIVATE ${SFML_INCLUDE_DIR}) |
96 | 96 | endif() |
97 | 97 |
|
98 | | -## Nana |
| 98 | +# Nana |
99 | 99 | if( DEFINED CPP_STARTER_USE_NANA ) |
100 | 100 | include(ExternalProject) |
101 | 101 | ExternalProject_add( |
|
0 commit comments