diff options
Diffstat (limited to 'userconfig-sthalik@Windows-GNU.cmake')
| -rw-r--r-- | userconfig-sthalik@Windows-GNU.cmake | 28 |
1 files changed, 17 insertions, 11 deletions
diff --git a/userconfig-sthalik@Windows-GNU.cmake b/userconfig-sthalik@Windows-GNU.cmake index 81d99338..99bb412a 100644 --- a/userconfig-sthalik@Windows-GNU.cmake +++ b/userconfig-sthalik@Windows-GNU.cmake @@ -13,23 +13,22 @@ sets(STRING list(APPEND CMAKE_IGNORE_PATH "c:/msys64" "c:/msys64/clang64") list(APPEND CMAKE_IGNORE_PREFIX_PATH "c:/msys64" "c:/msys64/clang64") -add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fconcepts-diagnostics-depth=3>) +add_definitions(-D_GLIBCXX_USE_DEPRECATED=0 -D_GLIBCXX_USE_CXX11_ABI) add_compile_options(-fdiagnostics-color=always) -add_compile_options(-fstack-usage -Wstack-usage=16384) +add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fconcepts-diagnostics-depth=3>) + +add_definitions(-D_GLIBCXX_ASSERTIONS) +add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:$<$<CONFIG:DEBUG,Debug>:-D_GLIBCXX_DEBUG>>) +add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:$<$<CONFIG:DEBUG,Debug>:-D_GLIBCXX_DEBUG_PEDANTIC>>) +add_compile_definitions($<$<NOT:$<CONFIG:Debug,DEBUG>>:_FORTIFY_SOURCE=2>) +add_compile_definitions($<$<CONFIG:Debug,DEBUG>:_FORTIFY_SOURCE=3>) if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") - add_definitions(-D_GLIBCXX_ASSERTIONS) - add_definitions(-D_GLIBCXX_USE_DEPRECATED=0 -D_GLIBCXX_USE_CXX11_ABI) - add_definitions(-D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC) set(OpenCV_DIR "f:/build/opencv/build-gcc-debug-floormat/install" CACHE PATH "" FORCE) else() set(BUILD_SHARED_LIBS OFF) set(OpenCV_DIR "f:/build/opencv/build-gcc-release-floormat/install" CACHE PATH "" FORCE) endif() -add_compile_definitions("$<$<CONFIG:Debug,DEBUG>:_FORTIFY_SOURCE=3>") -add_compile_definitions("$<IF:$<CONFIG:Debug,DEBUG>,,_FORTIFY_SOURCE=3>") - -set(FLOORMAT_SUBMODULE-SDL2 1) # for building submodule dependencies function(fm-userconfig-external) @@ -70,23 +69,30 @@ endfunction() # for floormat sources only function(fm-userconfig-src) + add_compile_options(-fstack-usage -Wstack-usage=16384) add_compile_options( -Wall -Wextra -Wpedantic -Wno-old-style-cast -Wno-padded -Wstringop-overflow -Wstringop-truncation -Wswitch-enum -Wlarger-than=8192 -Wlogical-op -Wunsafe-loop-optimizations + -Wctor-dtor-privacy -Wno-error=ctor-dtor-privacy + -Winvalid-constexpr -Winvalid-imported-macros + -Woverloaded-virtual + #-fconcepts-diagnostics-depth=2 ) #add_compile_options(-Wuseless-cast) - add_link_options(-Wno-lto-type-mismatch -Wno-odr) + add_link_options(-Wno-lto-type-mismatch -Wodr -Wno-error=odr) add_compile_options( #-Wno-c++20-compat -Wno-switch-enum -Wno-ctad-maybe-unsupported -Wno-ignored-attributes -Wno-parentheses - -Wno-lto-type-mismatch -Wno-odr + #-Wno-lto-type-mismatch -Wno-odr + -Wno-error=lto-type-mismatch + -Wodr -Wno-error=odr ) add_compile_options( -Werror=format |