emrekovanci · emrekovanci · Feb 27, 2025 · Feb 26, 2025 · Feb 26, 2025 · Feb 26, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.26)
 
 include(cmake/PreventInSourceBuilds.cmake)
+include(cmake/Features.cmake)
 
 project(
     Template-CPP
@@ -10,7 +11,8 @@ project(
     LANGUAGES CXX
 )
 
-include(cmake/Variables.cmake)
+include(cmake/CompilerWarnings.cmake)
+include(cmake/LinkerFlags.cmake)
 
 if(FEATURE_TESTS)
     enable_testing()

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -2,4 +2,6 @@
 
 add_executable(Application App.cpp)
 target_link_libraries(Application PRIVATE Core)
+set_compiler_warnings(Application)
+set_linker_flags(Application)
 install(TARGETS Application)
diff --git a/cmake/CompilerWarnings.cmake b/cmake/CompilerWarnings.cmake
@@ -0,0 +1,116 @@
+function(set_compiler_warnings target)
+    if(MSVC)
+        if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+            set(PROJECT_WARNINGS
+                -Wall
+                -Wextra
+                -Wshadow
+                -Wpedantic
+                -Wunused
+                -Wformat=2
+                -Wnull-dereference
+                -Wnon-virtual-dtor
+                -Woverloaded-virtual
+                -Wold-style-cast
+                -Wno-missing-prototypes
+                -Wno-switch-enum
+                -Wno-c++98-compat
+                -Wno-c++98-compat-pedantic
+                /EHsc)
+        else()
+            # Note that all the flags after /W4 are required for MSVC to conform to the language standard
+            set(PROJECT_WARNINGS
+                    /guard:cf
+                    /utf-8
+                    /diagnostics:caret
+                    /sdl
+                    /w14165
+                    /w44242
+                    /w44254
+                    /w44263
+                    /w34265
+                    /w34287
+                    /w44296
+                    /w44388
+                    /w44464
+                    /w14545
+                    /w14546
+                    /w14547
+                    /w14549
+                    /w14555
+                    /w34619
+                    /w34640
+                    /w24826
+                    /w14905
+                    /w14906
+                    /w14928
+                    /w45038
+                    /W4
+                    /permissive-
+                    /volatile:iso
+                    /Zc:inline
+                    /Zc:preprocessor
+                    /Zc:enumTypes
+                    /Zc:lambda
+                    /Zc:__cplusplus
+                    /Zc:externConstexpr
+                    /Zc:throwingNew
+                    /EHsc)
+        endif()
+    elseif(APPLE AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+        set(PROJECT_WARNINGS
+            -fstack-protector-strong
+            -Wall
+            -Wextra
+            -Wpedantic
+            -Wconversion
+            -Wsign-conversion
+            -Wcast-qual
+            -Wformat=2
+            -Wundef
+            -Werror=float-equal
+            -Wshadow
+            -Wcast-align
+            -Wunused
+            -Wnull-dereference
+            -Wdouble-promotion
+            -Wimplicit-fallthrough
+            -Wextra-semi
+            -Woverloaded-virtual
+            -Wnon-virtual-dtor
+            -Wold-style-cast
+        )
+    elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+        set(PROJECT_WARNINGS
+            -U_FORTIFY_SOURCE
+            -D_FORTIFY_SOURCE=3
+            -D_GLIBCXX_ASSERTIONS=1
+            -fstack-protector-strong
+            -fcf-protection=full
+            -fstack-clash-protection
+            -Wall
+            -Wextra
+            -Wpedantic
+            -Wconversion
+            -Wsign-conversion
+            -Wcast-qual
+            -Wformat=2
+            -Wundef
+            -Werror=float-equal
+            -Wshadow
+            -Wcast-align
+            -Wunused
+            -Wnull-dereference
+            -Wdouble-promotion
+            -Wimplicit-fallthrough
+            -Wextra-semi
+            -Woverloaded-virtual
+            -Wnon-virtual-dtor
+            -Wold-style-cast
+        )
+    else()
+        message(AUTHOR_WARNING "No compiler warnings set for CXX compiler: '${CMAKE_CXX_COMPILER_ID}'")
+    endif()
+
+    target_compile_options(${target} PRIVATE ${PROJECT_WARNINGS})
+endfunction()
diff --git a/cmake/Features.cmake b/cmake/Features.cmake
@@ -0,0 +1,8 @@
+option(FEATURE_TESTS "Enable the tests" OFF)
+if(FEATURE_TESTS)
+    list(APPEND VCPKG_MANIFEST_FEATURES "tests")
+endif()
+
+if(PROJECT_IS_TOP_LEVEL)
+    option(BUILD_SHARED_LIBS "Build shared libs." OFF)
+endif()
diff --git a/cmake/LinkerFlags.cmake b/cmake/LinkerFlags.cmake
@@ -0,0 +1,9 @@
+function(set_linker_flags target)
+    if (MSVC)
+        set(PROJECT_LINK_OPTIONS /machine:x64 /guard:cf)
+    elseif (NOT APPLE AND (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU"))
+        set(PROJECT_LINK_OPTIONS -Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now,-z,nodlopen)
+    endif()
+
+    target_link_options(${target} PRIVATE ${PROJECT_LINK_OPTIONS})
+endfunction()
diff --git a/cmake/Platform/Common/CMakePresets.json b/cmake/Platform/Common/CMakePresets.json
@@ -159,40 +159,6 @@
             "cacheVariables": {
                 "CMAKE_CXX_COMPILER": "clang++"
             }
-        },
-        {
-            "name": "flags-msvc",
-            "description": "Note that all the flags after /W4 are required for MSVC to conform to the language standard",
-            "hidden": true,
-            "cacheVariables": {
-                "CMAKE_CXX_FLAGS": "/sdl /guard:cf /utf-8 /diagnostics:caret /sdl /w14165 /w44242 /w44254 /w44263 /w34265 /w34287 /w44296 /w44388 /w44464 /w14545 /w14546 /w14547 /w14549 /w14555 /w34619 /w34640 /w24826 /w14905 /w14906 /w14928 /w45038 /W4 /permissive- /volatile:iso /Zc:inline /Zc:preprocessor /Zc:enumTypes /Zc:lambda /Zc:__cplusplus /Zc:externConstexpr /Zc:throwingNew /EHsc",
-                "CMAKE_EXE_LINKER_FLAGS": "/machine:x64 /guard:cf",
-                "CMAKE_SHARED_LINKER_FLAGS": "/machine:x64 /guard:cf"
-            }
-        },
-        {
-            "name": "flags-llvm",
-            "hidden": true,
-            "cacheVariables": {
-                "CMAKE_CXX_FLAGS": "-Wall -Wextra -Wshadow -Wpedantic -Wunused -Wformat=2 -Wnull-dereference -Wnon-virtual-dtor -Woverloaded-virtual -Wold-style-cast -Wno-missing-prototypes -Wno-switch-enum -Wno-c++98-compat -Wno-c++98-compat-pedantic /EHsc"
-            }
-        },
-        {
-            "name": "flags-gcc-clang",
-            "description": "These flags are supported by both GCC and Clang",
-            "hidden": true,
-            "cacheVariables": {
-                "CMAKE_CXX_FLAGS": "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -D_GLIBCXX_ASSERTIONS=1 -fstack-protector-strong -fcf-protection=full -fstack-clash-protection -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast",
-                "CMAKE_EXE_LINKER_FLAGS": "-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now,-z,nodlopen",
-                "CMAKE_SHARED_LINKER_FLAGS": "-Wl,--allow-shlib-undefined,--as-needed,-z,noexecstack,-z,relro,-z,now,-z,nodlopen"
-            }
-        },
-        {
-            "name": "flags-appleclang",
-            "hidden": true,
-            "cacheVariables": {
-                "CMAKE_CXX_FLAGS": "-fstack-protector-strong -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -Wcast-qual -Wformat=2 -Wundef -Werror=float-equal -Wshadow -Wcast-align -Wunused -Wnull-dereference -Wdouble-promotion -Wimplicit-fallthrough -Wextra-semi -Woverloaded-virtual -Wnon-virtual-dtor -Wold-style-cast"
-            }
         }
     ],
     "buildPresets": [

diff --git a/cmake/Platform/Linux/CMakePresets.json b/cmake/Platform/Linux/CMakePresets.json
@@ -19,7 +19,6 @@
                 "cpp-standard",
                 "ninja",
                 "gcc",
-                "flags-gcc-clang",
                 "vcpkg"
             ]
         },
@@ -33,7 +32,6 @@
                 "cpp-standard",
                 "ninja",
                 "clang++",
-                "flags-gcc-clang",
                 "vcpkg"
             ]
         }

diff --git a/cmake/Platform/Mac/CMakePresets.json b/cmake/Platform/Mac/CMakePresets.json
@@ -19,7 +19,6 @@
                 "cpp-standard",
                 "ninja",
                 "clang++",
-                "flags-appleclang",
                 "vcpkg"
             ]
         },
@@ -33,7 +32,6 @@
                 "cpp-standard",
                 "xcode",
                 "clang++",
-                "flags-appleclang",
                 "vcpkg"
             ]
         }

diff --git a/cmake/Platform/Windows/CMakePresets.json b/cmake/Platform/Windows/CMakePresets.json
@@ -19,7 +19,6 @@
                 "cpp-standard",
                 "vs2022",
                 "msvc",
-                "flags-msvc",
                 "vcpkg"
             ],
             "architecture": {
@@ -41,7 +40,6 @@
                 "cpp-standard",
                 "vs2022",
                 "clang-cl",
-                "flags-llvm",
                 "vcpkg"
             ],
             "architecture": {
@@ -63,7 +61,6 @@
                 "cpp-standard",
                 "ninja",
                 "msvc",
-                "flags-msvc",
                 "vcpkg"
             ],
             "architecture": {
@@ -85,7 +82,6 @@
                 "cpp-standard",
                 "ninja",
                 "clang-cl",
-                "flags-llvm",
                 "vcpkg"
             ],
             "architecture": {

diff --git a/cmake/PreventInSourceBuilds.cmake b/cmake/PreventInSourceBuilds.cmake
@@ -1,5 +1,3 @@
-# ---- In-source guard ----
-
 if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     message(
         FATAL_ERROR

diff --git a/cmake/Variables.cmake b/cmake/Variables.cmake
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
@@ -5,7 +5,8 @@ add_library(Core
     src/Core/Lib.cpp
 )
 target_include_directories(Core PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/include>")
-target_compile_features(Core PUBLIC cxx_std_20)
+set_compiler_warnings(Core)
+set_linker_flags(Core)
 
 include(GenerateExportHeader)
 generate_export_header(Core

diff --git a/library/test/CMakeLists.txt b/library/test/CMakeLists.txt
@@ -7,7 +7,6 @@ set(CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE PRE_TEST)
 
 add_executable(CoreTests Tests.cpp)
 target_link_libraries(CoreTests PRIVATE Core Catch2::Catch2WithMain)
-target_compile_features(CoreTests PRIVATE cxx_std_20)
 
 # ---- Tests ----