|
1 | 1 | diff --git a/cmake/ThirdPartyDependencies.cmake b/cmake/ThirdPartyDependencies.cmake |
2 | | -index f02af02..1a51f82 100644 |
| 2 | +index f02af02..f83c181 100644 |
3 | 3 | --- a/cmake/ThirdPartyDependencies.cmake |
4 | 4 | +++ b/cmake/ThirdPartyDependencies.cmake |
5 | | -@@ -15,48 +15,48 @@ function(declare_system_library target) |
| 5 | +@@ -15,49 +15,6 @@ function(declare_system_library target) |
6 | 6 | $<TARGET_PROPERTY:${target},INTERFACE_INCLUDE_DIRECTORIES>) |
7 | 7 | endfunction() |
8 | 8 |
|
@@ -48,55 +48,15 @@ index f02af02..1a51f82 100644 |
48 | 48 | - "SPDLOG_BUILD_SHARED OFF" |
49 | 49 | - "SPDLOG_FMT_EXTERNAL ON") |
50 | 50 | -endif() |
51 | | -+# if(NOT TARGET fmt::fmt) |
52 | | -+# # https://github.com/fmtlib/fmt/releases |
53 | | -+# cpmaddpackage( |
54 | | -+# NAME |
55 | | -+# fmt |
56 | | -+# GIT_TAG |
57 | | -+# 11.0.1 |
58 | | -+# VERSION |
59 | | -+# 11.0.1 |
60 | | -+# GITHUB_REPOSITORY |
61 | | -+# "fmtlib/fmt" |
62 | | -+# EXCLUDE_FROM_ALL ON |
63 | | -+# OPTIONS |
64 | | -+# "FMT_INSTALL OFF" |
65 | | -+# # Unicode support for MSVC enabled in CompilerWarnings.cmake |
66 | | -+# "FMT_UNICODE OFF" |
67 | | -+# "FMT_DOC OFF" |
68 | | -+# "BUILD_SHARED_LIBS OFF" |
69 | | -+# "CMAKE_C_VISIBILITY_PRESET hidden" |
70 | | -+# "CMAKE_CXX_VISIBILITY_PRESET hidden" |
71 | | -+# "CMAKE_POSITION_INDEPENDENT_CODE ON") |
72 | | -+# endif() |
73 | | -+ |
74 | | -+# if(NOT TARGET spdlog::spdlog) |
75 | | -+# # https://github.com/gabime/spdlog/releases |
76 | | -+# cpmaddpackage( |
77 | | -+# NAME |
78 | | -+# spdlog |
79 | | -+# VERSION |
80 | | -+# 1.14.1 |
81 | | -+# GITHUB_REPOSITORY |
82 | | -+# "gabime/spdlog" |
83 | | -+# EXCLUDE_FROM_ALL ON |
84 | | -+# OPTIONS |
85 | | -+# "SPDLOG_INSTALL OFF" |
86 | | -+# "BUILD_SHARED_LIBS OFF" |
87 | | -+# "CMAKE_C_VISIBILITY_PRESET hidden" |
88 | | -+# "CMAKE_CXX_VISIBILITY_PRESET hidden" |
89 | | -+# "CMAKE_POSITION_INDEPENDENT_CODE ON" |
90 | | -+# "SPDLOG_BUILD_SHARED OFF" |
91 | | -+# "SPDLOG_FMT_EXTERNAL ON") |
92 | | -+# endif() |
93 | | - |
| 51 | +- |
94 | 52 | if(NOT TARGET Microsoft.GSL::GSL) |
95 | 53 | # https://github.com/microsoft/GSL/releases |
96 | | -@@ -172,70 +172,70 @@ if(NOT TARGET taocpp::json) |
| 54 | + cpmaddpackage( |
| 55 | +@@ -171,72 +128,6 @@ if(NOT TARGET taocpp::json) |
| 56 | + "TAOCPP_JSON_BUILD_EXAMPLES OFF") |
97 | 57 | endif() |
98 | 58 |
|
99 | | - |
| 59 | +- |
100 | 60 | -if(NOT TARGET asio::asio) |
101 | 61 | - # https://github.com/chriskohlhoff/asio/tags |
102 | 62 | - cpmaddpackage( |
@@ -161,81 +121,15 @@ index f02af02..1a51f82 100644 |
161 | 121 | - |
162 | 122 | - add_library(asio::asio ALIAS asio) |
163 | 123 | -endif() |
164 | | -+# if(NOT TARGET asio::asio) |
165 | | -+# # https://github.com/chriskohlhoff/asio/tags |
166 | | -+# cpmaddpackage( |
167 | | -+# NAME |
168 | | -+# asio |
169 | | -+# GIT_TAG |
170 | | -+# asio-1-31-0 |
171 | | -+# VERSION |
172 | | -+# 1.31.0 |
173 | | -+# GITHUB_REPOSITORY |
174 | | -+# "chriskohlhoff/asio" |
175 | | -+# EXCLUDE_FROM_ALL ON) |
176 | | -+# endif() |
177 | | -+ |
178 | | -+# # ASIO doesn't use CMake, we have to configure it manually. Extra notes for using on Windows: |
179 | | -+# # |
180 | | -+# # 1) If _WIN32_WINNT is not set, ASIO assumes _WIN32_WINNT=0x0501, i.e. Windows XP target, which is definitely not the |
181 | | -+# # platform which most users target. |
182 | | -+# # |
183 | | -+# # 2) WIN32_LEAN_AND_MEAN is defined to make Winsock2 work. |
184 | | -+# if(asio_ADDED) |
185 | | -+# add_library(asio STATIC ${asio_SOURCE_DIR}/asio/src/asio.cpp ${asio_SOURCE_DIR}/asio/src/asio_ssl.cpp) |
186 | | -+ |
187 | | -+# target_include_directories(asio SYSTEM PUBLIC ${asio_SOURCE_DIR}/asio/include) |
188 | | -+# target_compile_definitions(asio PRIVATE ASIO_STANDALONE=1 ASIO_NO_DEPRECATED=1 ASIO_SEPARATE_COMPILATION=1) |
189 | | -+# target_link_libraries(asio PRIVATE Threads::Threads OpenSSL::SSL OpenSSL::Crypto) |
190 | | -+# set_target_properties( |
191 | | -+# asio |
192 | | -+# PROPERTIES C_VISIBILITY_PRESET hidden |
193 | | -+# CXX_VISIBILITY_PRESET hidden |
194 | | -+# POSITION_INDEPENDENT_CODE TRUE) |
195 | | -+ |
196 | | -+# if(WIN32) |
197 | | -+# # macro see @ https://stackoverflow.com/a/40217291/1746503 |
198 | | -+# macro(get_win32_winnt version) |
199 | | -+# if(CMAKE_SYSTEM_VERSION) |
200 | | -+# set(ver ${CMAKE_SYSTEM_VERSION}) |
201 | | -+# string(REGEX MATCH "^([0-9]+).([0-9])" ver ${ver}) |
202 | | -+# string(REGEX MATCH "^([0-9]+)" verMajor ${ver}) |
203 | | -+# # Check for Windows 10, b/c we'll need to convert to hex 'A'. |
204 | | -+# if("${verMajor}" MATCHES "10") |
205 | | -+# set(verMajor "A") |
206 | | -+# string(REGEX REPLACE "^([0-9]+)" ${verMajor} ver ${ver}) |
207 | | -+# endif("${verMajor}" MATCHES "10") |
208 | | -+# # Remove all remaining '.' characters. |
209 | | -+# string(REPLACE "." "" ver ${ver}) |
210 | | -+# # Prepend each digit with a zero. |
211 | | -+# string(REGEX REPLACE "([0-9A-Z])" "0\\1" ver ${ver}) |
212 | | -+# set(${version} "0x${ver}") |
213 | | -+# endif() |
214 | | -+# endmacro() |
215 | | -+ |
216 | | -+# if(NOT DEFINED _WIN32_WINNT) |
217 | | -+# get_win32_winnt(ver) |
218 | | -+# set(_WIN32_WINNT ${ver}) |
219 | | -+# endif() |
220 | | -+ |
221 | | -+# message(STATUS "Set _WIN32_WINNT=${_WIN32_WINNT}") |
222 | | -+ |
223 | | -+# target_compile_definitions(asio INTERFACE _WIN32_WINNT=${_WIN32_WINNT} WIN32_LEAN_AND_MEAN) |
224 | | -+# endif() |
225 | | -+ |
226 | | -+# add_library(asio::asio ALIAS asio) |
227 | | -+# endif() |
228 | | - |
| 124 | +- |
229 | 125 | add_library(jsonsl OBJECT ${PROJECT_SOURCE_DIR}/third_party/jsonsl/jsonsl.c) |
230 | 126 | set_target_properties(jsonsl PROPERTIES C_VISIBILITY_PRESET hidden POSITION_INDEPENDENT_CODE TRUE) |
231 | | -@@ -245,7 +245,7 @@ declare_system_library(snappy) |
| 127 | + target_include_directories(jsonsl SYSTEM PUBLIC ${PROJECT_SOURCE_DIR}/third_party/jsonsl) |
| 128 | +@@ -245,7 +136,4 @@ declare_system_library(snappy) |
232 | 129 | declare_system_library(llhttp::llhttp) |
233 | 130 | declare_system_library(hdr_histogram_static) |
234 | 131 | declare_system_library(Microsoft.GSL::GSL) |
235 | 132 | -declare_system_library(spdlog::spdlog) |
236 | 133 | -declare_system_library(fmt::fmt) |
237 | 134 | -declare_system_library(asio) |
238 | | -+# declare_system_library(spdlog::spdlog) |
239 | | -+# declare_system_library(fmt::fmt) |
240 | | -+# declare_system_library(asio) |
241 | 135 | declare_system_library(taocpp::json) |
0 commit comments