diff options
Diffstat (limited to 'userconfig-sthalik@Windows-Clang.cmake')
| -rw-r--r-- | userconfig-sthalik@Windows-Clang.cmake | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/userconfig-sthalik@Windows-Clang.cmake b/userconfig-sthalik@Windows-Clang.cmake index dc0ba1dd..4f2d9dfa 100644 --- a/userconfig-sthalik@Windows-Clang.cmake +++ b/userconfig-sthalik@Windows-Clang.cmake @@ -11,6 +11,7 @@ if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") -fcoverage-mapping ) endif() + add_definitions(-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_EXTENSIVE) else() set(BUILD_SHARED_LIBS OFF) add_compile_options(-march=native -mavx2) @@ -19,6 +20,8 @@ else() add_link_options(-fmerge-all-constants -flto=full -fwhole-program-vtables -fforce-emit-vtables) add_link_options(-Wl,--gc-sections -Wl,--icf=all) add_compile_options(-Wno-nan-infinity-disabled) + add_definitions(-D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_FAST) + add_compile_options(-fpointer-tbaa) endif() if(FLOORMAT_ASAN) @@ -26,13 +29,13 @@ if(FLOORMAT_ASAN) add_link_options(-fsanitize=undefined,bounds,address) endif() -set(OpenCV_DIR "f:/build/opencv/build-clang-release-floormat/install" CACHE PATH "" FORCE) +set(OpenCV_DIR "d:/dev/opencv-floormat-clang-release" CACHE PATH "" FORCE) set(CMAKE_INSTALL_MESSAGE NEVER) sets(STRING CMAKE_C_FLAGS "-march=x86-64-v2 -mtune=native -mavx2 -maes -g -gcolumn-info -gdwarf-aranges" CMAKE_C_FLAGS_DEBUG "-O0 -fstack-protector-all -g" - CMAKE_C_FLAGS_RELEASE "-Ofast -ffast-math -mpopcnt -fomit-frame-pointer -fno-stack-protector -static" + CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -mpopcnt -fomit-frame-pointer -fno-stack-protector -static" CMAKE_EXE_LINKER_FLAGS_DEBUG "" CMAKE_SHARED_LINKER_FLAGS_DEBUG "" ) @@ -42,12 +45,12 @@ sets(STRING CMAKE_CXX_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" ) +add_definitions(-D_LIBCPP_REMOVE_TRANSITIVE_INCLUDES) + if(NOT CMAKE_CXX_COMPILER_VERSION LESS "18.0") add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fassume-nothrow-exception-dtor>) endif() -set(FLOORMAT_SUBMODULE-SDL2 1) - # for building submodule dependencies function(fm-userconfig-external) add_compile_options( @@ -62,15 +65,15 @@ function(fm-userconfig-external) SDL_SHARED OFF SDL_STATIC ON CORRADE_BUILD_STATIC ON - CORRADE_BUILD_TESTS OFF + CORRADE_BUILD_TESTS ON CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT ON MAGNUM_BUILD_PLUGINS_STATIC ON MAGNUM_BUILD_STATIC ON - MAGNUM_BUILD_TESTS OFF + MAGNUM_BUILD_TESTS ON ) else() sets(BOOL - FLOORMAT_SUBMODULE-SDL2 OFF + FLOORMAT_SUBMODULE-SDL2 ON SDL_SHARED ON SDL_STATIC OFF CORRADE_BUILD_STATIC OFF @@ -81,14 +84,6 @@ function(fm-userconfig-external) MAGNUM_BUILD_TESTS ON ) endif() - if(FLOORMAT_ASAN) - sets(BOOL - CORRADE_BUILD_STATIC ON - CORRADE_BUILD_TESTS OFF - MAGNUM_BUILD_STATIC ON - MAGNUM_BUILD_TESTS OFF - ) - endif() endfunction() # for test_app sources only |