From eeb63b8901a9c049f1bb594abb9ce9b4a9c47620 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 11 Jan 2021 16:39:43 +0000 Subject: zlib -> libdeflate (#5085) + Use libdeflate + Use std::byte * Fix passing temporary to string_view + Emulate make_unique_for_overwrite --- CMake/AddDependencies.cmake | 4 ++-- CMake/GroupSources.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'CMake') diff --git a/CMake/AddDependencies.cmake b/CMake/AddDependencies.cmake index f16e5a327..9f73df3c7 100644 --- a/CMake/AddDependencies.cmake +++ b/CMake/AddDependencies.cmake @@ -28,7 +28,7 @@ function(build_dependencies) # Enumerate all submodule libraries # SQLiteCpp needs to be included before sqlite so the lsqlite target is available: - set(DEPENDENCIES expat fmt jsoncpp libevent lua luaexpat mbedtls SQLiteCpp sqlite tolua++ zlib) + set(DEPENDENCIES expat fmt jsoncpp libdeflate libevent lua luaexpat mbedtls SQLiteCpp sqlite tolua++) foreach(DEPENDENCY ${DEPENDENCIES}) # Check that the libraries are present: if (NOT EXISTS "${PROJECT_SOURCE_DIR}/lib/${DEPENDENCY}/CMakeLists.txt") @@ -62,13 +62,13 @@ function(link_dependencies TARGET) event_extra fmt::fmt jsoncpp_lib + libdeflate lsqlite lualib luaexpat mbedtls SQLiteCpp tolualib - zlib ) # Link process information library: diff --git a/CMake/GroupSources.cmake b/CMake/GroupSources.cmake index a6d2bcc0e..59bd8c5c0 100644 --- a/CMake/GroupSources.cmake +++ b/CMake/GroupSources.cmake @@ -9,6 +9,7 @@ function(group_sources) expat fmt jsoncpp_lib + libdeflate lualib luaexpat mbedcrypto @@ -18,7 +19,6 @@ function(group_sources) sqlite3 SQLiteCpp tolualib - zlib PROPERTIES FOLDER Libraries ) -- cgit v1.2.3