diff options
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | cmake/msvc.cmake | 9 | ||||
| -rw-r--r-- | userconfig-sthalik@Windows-MSVC.cmake | 18 |
3 files changed, 24 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d6eba06..5e07ee41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -147,7 +147,7 @@ else() endif() if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang") - add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:$<$<CONFIG:DEBUG>:_LIBCPP_ENABLE_ASSERTIONS>>) + add_compile_definitions($<$<COMPILE_LANGUAGE:CXX>:$<$<CONFIG:DEBUG,Debug>:_LIBCPP_ENABLE_ASSERTIONS>>) add_compile_options(-Wno-reserved-macro-identifier) add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-ambiguous-reversed-operator>) endif() diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 78ce9e0d..933247b2 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -78,12 +78,15 @@ if(DEFINED floormat-64bit) endif() endif() -set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>") +set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:DEBUG,Debug>:Debug>") add_link_options(-cgthreads:$ENV{NUMBER_OF_PROCESSORS}) set(_CFLAGS "-diagnostics:caret -Zc:inline -Zc:preprocessor -wd4117 -Zi -Zf -Zo -bigobj -cgthreads1 -vd0 -permissive-") -if(NOT floormat-no-static-crt) +string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE) +if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") + set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDebugDLL" CACHE INTERNAL "" FORCE) +elseif(NOT floormat-no-static-crt) set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded" CACHE INTERNAL "" FORCE) else() set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreadedDLL" CACHE INTERNAL "" FORCE) @@ -93,7 +96,7 @@ set(_CFLAGS_RELEASE "-O2 -Oit -Oy- -Ob3 -fp:fast -GS- -GF -GL -Gw -Gy") if(NOT floormat-simd STREQUAL "") set(_CFLAGS_RELEASE "${_CFLAGS_RELEASE} -arch:${floormat-simd}") endif() -set(_CFLAGS_DEBUG "-guard:cf -MTd -Gs0 -RTCs") +set(_CFLAGS_DEBUG "-guard:cf -MDd -RTCsu") set(_CXXFLAGS_RELEASE "${_CFLAGS_RELEASE}") set(_CXXFLAGS_DEBUG "${_CFLAGS_DEBUG}") diff --git a/userconfig-sthalik@Windows-MSVC.cmake b/userconfig-sthalik@Windows-MSVC.cmake index d7777ad9..87cc7184 100644 --- a/userconfig-sthalik@Windows-MSVC.cmake +++ b/userconfig-sthalik@Windows-MSVC.cmake @@ -2,8 +2,19 @@ set(CMAKE_C_COMPILER_INIT cl.exe) set(CMAKE_CXX_COMPILER_INIT cl.exe) set(CMAKE_ASM_NASM_COMPILER nasm.exe) +string(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE) +set(CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING "" FORCE) + set(CMAKE_TOOLCHAIN_FILE "${CMAKE_SOURCE_DIR}/cmake/msvc.cmake" CACHE FILEPATH "" FORCE) -set(OpenCV_DIR "F:/dev/opentrack-depends/opencv/build-amd64/install" CACHE PATH "" FORCE) + +if(NOT DEFINED OpenCV_DIR) + if(CMAKE_BUILD_TYPE STREQUAL "DEBUG") + #set(OpenCV_DIR "F:/dev/opentrack-depends/opencv/build-msvc64-debug/install" CACHE PATH "" FORCE) + sets(PATH OpenCV_DIR "") + else() + set(OpenCV_DIR "F:/dev/opentrack-depends/opencv/build-amd64/install" CACHE PATH "" FORCE) + endif() +endif() list(APPEND CMAKE_IGNORE_PATH "c:/msys64") list(APPEND CMAKE_IGNORE_PREFIX_PATH "c:/msys64") @@ -15,6 +26,10 @@ sets(BOOL FLOORMAT_SUBMODULE-SDL2 ON) add_link_options(-STACK:41943040) add_link_options(-WX:NO) +if(FLOORMAT_ASAN) + add_compile_options(-fsanitize-address-use-after-return -fsanitize=address) +endif() + if(CMAKE_SIZEOF_VOID_P GREATER 4) set(CMAKE_C_COMPILER_LAUNCHER msvc64.cmd) set(CMAKE_CXX_COMPILER_LAUNCHER msvc64.cmd) @@ -37,6 +52,7 @@ function(fm-userconfig-external) SDL_STATIC OFF SDL_SHARED ON SDL_FORCE_STATIC_VCRT OFF + SDL_LIBC ON CORRADE_BUILD_STATIC OFF CORRADE_PLUGINMANAGER_NO_DYNAMIC_PLUGIN_SUPPORT OFF MAGNUM_BUILD_STATIC OFF |