From 47e6bc258e12cb0dd2541c5d1b6b1e10e40fd1cd Mon Sep 17 00:00:00 2001 From: fdr400 Date: Mon, 27 Jan 2025 20:50:37 +0300 Subject: [PATCH] Rebase --- cmake/install/userver-universal-config.cmake | 2 +- universal/CMakeLists.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cmake/install/userver-universal-config.cmake b/cmake/install/userver-universal-config.cmake index e3c068826929..273aa704bd27 100644 --- a/cmake/install/userver-universal-config.cmake +++ b/cmake/install/userver-universal-config.cmake @@ -47,7 +47,7 @@ if (USERVER_CONAN) find_package(RapidJSON REQUIRED CONFIG) else() find_package(fmt REQUIRED) - find_package(cczt REQUIRED) + find_package(cctz REQUIRED) find_package(CryptoPP REQUIRED) find_package(libyamlcpp REQUIRED) find_package(libzstd REQUIRED) diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt index 26abc159db40..d45d9880d7dc 100644 --- a/universal/CMakeLists.txt +++ b/universal/CMakeLists.txt @@ -418,6 +418,7 @@ _userver_directory_install(COMPONENT universal FILES "${USERVER_ROOT_DIR}/cmake/modules/Findlibzstd.cmake" "${USERVER_ROOT_DIR}/cmake/modules/Findcctz.cmake" "${USERVER_ROOT_DIR}/cmake/modules/Findre2.cmake" + "${USERVER_ROOT_DIR}/cmake/modules/Findfmt.cmake" "${USERVER_ROOT_DIR}/cmake/modules/FindJemalloc.cmake" "${USERVER_ROOT_DIR}/cmake/modules/FindUserverGBench.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/userver/modules