diff --git a/CMakeLists.txt b/CMakeLists.txt index bbdfef47..e694dfc4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,8 +10,6 @@ include(cmake/ide.cmake) spdlog_extract_version() -cmake_policy(SET CMP0091 NEW) # for choosing msvc static/dynamic runtime library - project(spdlog VERSION ${SPDLOG_VERSION} LANGUAGES CXX) message(STATUS "Build spdlog: ${SPDLOG_VERSION}") @@ -89,7 +87,6 @@ endif() if(WIN32) option(SPDLOG_WCHAR_SUPPORT "Support wchar api" OFF) option(SPDLOG_WCHAR_FILENAMES "Support wchar filenames" OFF) - option(SPDLOG_STATIC_VCRT "Force /MT for static VC runtimes" OFF) endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") option(SPDLOG_CLOCK_COARSE @@ -127,10 +124,6 @@ if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO) list(APPEND SPDLOG_SRCS src/fmt.cpp) endif() -if(MSVC AND SPDLOG_STATIC_VCRT) - set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$:Debug>") -endif() - if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS) if(WIN32) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY) @@ -299,3 +292,4 @@ if(SPDLOG_INSTALL) # --------------------------------------------------------------------------------------- include(cmake/spdlogCPack.cmake) endif() + diff --git a/cmake/utils.cmake b/cmake/utils.cmake index d56fc27a..da7c6ef4 100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -59,3 +59,4 @@ function(spdlog_enable_sanitizer target_name) target_compile_options(${target_name} PRIVATE -fno-omit-frame-pointer) target_link_libraries(${target_name} PRIVATE -fsanitize=address,undefined -fuse-ld=gold) endfunction() +