diff options
| author | seth <getchoo@tuta.io> | 2022-12-16 16:05:12 -0500 |
|---|---|---|
| committer | seth <getchoo@tuta.io> | 2022-12-16 16:05:12 -0500 |
| commit | a61daa40dcc93c7ab24bdf9bd1ff08d01576ae34 (patch) | |
| tree | 1657d10076d843c2aca1d8e77f777ff2bcacfdc0 | |
| parent | 7b805a38b9d87c5c5a765b692beca25f6944e897 (diff) | |
| download | PrismLauncher-a61daa40dcc93c7ab24bdf9bd1ff08d01576ae34.tar.gz PrismLauncher-a61daa40dcc93c7ab24bdf9bd1ff08d01576ae34.tar.bz2 PrismLauncher-a61daa40dcc93c7ab24bdf9bd1ff08d01576ae34.zip | |
fix: re-enable /GS and only use some flags on release builds
Signed-off-by: seth <getchoo@tuta.io>
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index db731c07..de9b6fe1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,13 +28,10 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_C_STANDARD 11) include(GenerateExportHeader) if(MSVC) - # /GL enables whole program optimizations - # /Gw helps reduce binary size - # /Gy allows the compiler to package individual functions - # /guard:cf enables control flow guard + # /GS Adds buffer security checks, default on but incuded anyway to mirror gcc's fstack-protector flag # /permissive- specify standards-conforming compiler behavior, also enabled by Qt6, default on with std:c++20 # Use /W4 as /Wall includes unnesserey warnings such as added padding to structs - set(CMAKE_CXX_FLAGS "/GL /Gw /Gy /guard:cf /permissive- /W4 ${CMAKE_CXX_FLAGS}") + set(CMAKE_CXX_FLAGS "/GS /permissive- /W4 ${CMAKE_CXX_FLAGS}") # LINK accepts /SUBSYSTEM whics sets if we are a WINDOWS (gui) or a CONSOLE programs # This implicitly selects an entrypoint specific to the subsystem selected @@ -46,6 +43,14 @@ if(MSVC) # /STACK sets the stack reserve size, ATL's pack list needs 3-4 MiB as of November 2022, provide 8 MiB set(CMAKE_EXE_LINKER_FLAGS "/LTCG /MANIFEST:NO /STACK:8388608 ${CMAKE_EXE_LINKER_FLAGS}") + # /GL enables whole program optimizations + # /Gw helps reduce binary size + # /Gy allows the compiler to package individual functions + # /guard:cf enables control flow guard + foreach(lang C CXX) + set("CMAKE_${lang}_FLAGS_RELEASE" "/GL /Gw /Gy /guard:cf") + endforeach() + # See https://github.com/ccache/ccache/issues/1040 # Note, CMake 3.25 replaces this with CMAKE_MSVC_DEBUG_INFORMATION_FORMAT # See https://cmake.org/cmake/help/v3.25/variable/CMAKE_MSVC_DEBUG_INFORMATION_FORMAT.html |