Skip to content

Commit 0613dbc

Browse files
author
gabime
committed
Revert pr #1860
1 parent 0ed0d69 commit 0613dbc

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

CMakeLists.txt

+1-7
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ include(cmake/ide.cmake)
1010

1111
spdlog_extract_version()
1212

13-
cmake_policy(SET CMP0091 NEW) # for choosing msvc static/dynamic runtime library
14-
1513
project(spdlog VERSION ${SPDLOG_VERSION} LANGUAGES CXX)
1614
message(STATUS "Build spdlog: ${SPDLOG_VERSION}")
1715

@@ -89,7 +87,6 @@ endif()
8987
if(WIN32)
9088
option(SPDLOG_WCHAR_SUPPORT "Support wchar api" OFF)
9189
option(SPDLOG_WCHAR_FILENAMES "Support wchar filenames" OFF)
92-
option(SPDLOG_STATIC_VCRT "Force /MT for static VC runtimes" OFF)
9390
endif()
9491
if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
9592
option(SPDLOG_CLOCK_COARSE
@@ -127,10 +124,6 @@ if(NOT SPDLOG_FMT_EXTERNAL AND NOT SPDLOG_FMT_EXTERNAL_HO)
127124
list(APPEND SPDLOG_SRCS src/fmt.cpp)
128125
endif()
129126

130-
if(MSVC AND SPDLOG_STATIC_VCRT)
131-
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
132-
endif()
133-
134127
if(SPDLOG_BUILD_SHARED OR BUILD_SHARED_LIBS)
135128
if(WIN32)
136129
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.rc.in ${CMAKE_CURRENT_BINARY_DIR}/version.rc @ONLY)
@@ -299,3 +292,4 @@ if(SPDLOG_INSTALL)
299292
# ---------------------------------------------------------------------------------------
300293
include(cmake/spdlogCPack.cmake)
301294
endif()
295+

cmake/utils.cmake

+1
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ function(spdlog_enable_sanitizer target_name)
5959
target_compile_options(${target_name} PRIVATE -fno-omit-frame-pointer)
6060
target_link_libraries(${target_name} PRIVATE -fsanitize=address,undefined -fuse-ld=gold)
6161
endfunction()
62+

0 commit comments

Comments
 (0)