Skip to content

Commit 7ce0402

Browse files
committed
.
1 parent b4e7b48 commit 7ce0402

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

CMakeLists.txt

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.16.3)
33
set(EXTERNAL_DIR "${CMAKE_SOURCE_DIR}/external")
44

55
if(MSVC)
6-
#set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
6+
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
77
endif()
88

99
if(APPLE)
@@ -78,28 +78,28 @@ else()
7878
endif()
7979

8080
# Make BoostConfig.cmake able to check its inputs
81-
#cmake_policy(SET CMP0057 NEW)
81+
cmake_policy(SET CMP0057 NEW)
8282

8383
# Honor the visibility properties for all target types, including
8484
# object libraries and static libraries.
85-
#cmake_policy(SET CMP0063 NEW)
85+
cmake_policy(SET CMP0063 NEW)
8686

8787
# Don't ignore <PackageName>_ROOT variables
88-
#cmake_policy(SET CMP0074 NEW)
88+
cmake_policy(SET CMP0074 NEW)
8989

9090
set(Protobuf_USE_STATIC_LIBS ON)
9191
endif()
9292

9393
message(STATUS "VCPKG TRIPLET: ${VCPKG_TARGET_TRIPLET}")
9494

95-
# Add cmake script directory.
96-
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
97-
set(CMAKE_MODULE_PATH "${EXTERNAL_DIR}/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH})
98-
9995
project(EternalTCP VERSION 6.2.9 LANGUAGES C CXX)
10096

10197
include(CMakeFindDependencyMacro)
10298

99+
# Add cmake script directory.
100+
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
101+
set(CMAKE_MODULE_PATH "${EXTERNAL_DIR}/sanitizers-cmake/cmake" ${CMAKE_MODULE_PATH})
102+
103103
# Do not install httplib files
104104
set(HTTPLIB_INSTALL OFF)
105105
set(HTTPLIB_USE_ZSTD_IF_AVAILABLE OFF)
@@ -141,6 +141,10 @@ if(LINUX)
141141
find_package(SELinux)
142142
endif()
143143

144+
if(MSVC)
145+
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
146+
endif()
147+
144148
# Using FreeBSD?
145149
if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
146150
set(FREEBSD TRUE)

0 commit comments

Comments
 (0)