fix cmake: fixes for local configuration

Anton3 · Anton3 · commit 5fed6ca88121 · 2025-12-15T14:42:53.000+03:00
* Use CPM's `GIT_SHALLOW` to avoid downloading heavy history of Protobuf, gRPC and other packages
* `write_package_stub` is no longer needed and only harms with CMake 3.24+. Do the right thing for all versions
* Fix cryptopp failing to configure with CPM + cmake-3.30
* Fix configuration of Protobuf from CPM
* Use simpler logic for checking availability of Google Benchmark ASLR
* Make CPM-downloaded CURL find CPM-downloaded libnghttp2
commit_hash:dcd14490fd6683b17790cf9e4c4f554ebb6f6a96
diff --git a/.mapping.json b/.mapping.json
@@ -583,6 +583,7 @@
   "cmake/modules/FindGssApi.cmake":"taxi/uservices/userver/cmake/modules/FindGssApi.cmake",
   "cmake/modules/FindPostgreSQLInternal.cmake":"taxi/uservices/userver/cmake/modules/FindPostgreSQLInternal.cmake",
   "cmake/modules/FindPythonDev.cmake":"taxi/uservices/userver/cmake/modules/FindPythonDev.cmake",
+  "cmake/modules/FindRapidJSON.cmake":"taxi/uservices/userver/cmake/modules/FindRapidJSON.cmake",
   "cmake/modules/FindRdKafka.cmake":"taxi/uservices/userver/cmake/modules/FindRdKafka.cmake",
   "cmake/modules/FindSASL2.cmake":"taxi/uservices/userver/cmake/modules/FindSASL2.cmake",
   "cmake/modules/FindUserverGBench.cmake":"taxi/uservices/userver/cmake/modules/FindUserverGBench.cmake",
@@ -5113,7 +5114,6 @@
   "universal/CMakeLists.txt":"taxi/uservices/userver/universal/CMakeLists.txt",
   "universal/README.md":"taxi/uservices/userver/universal/README.md",
   "universal/benchmarks/main.cpp":"taxi/uservices/userver/universal/benchmarks/main.cpp",
-  "universal/benchmarks/main_check_aslr_disable.cpp":"taxi/uservices/userver/universal/benchmarks/main_check_aslr_disable.cpp",
   "universal/include/userver/cache/impl/lru.hpp":"taxi/uservices/userver/universal/include/userver/cache/impl/lru.hpp",
   "universal/include/userver/cache/impl/slru.hpp":"taxi/uservices/userver/universal/include/userver/cache/impl/slru.hpp",
   "universal/include/userver/cache/lru_map.hpp":"taxi/uservices/userver/universal/include/userver/cache/lru_map.hpp",
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -188,7 +188,7 @@ include(ModuleHelpers)
 include(AddGoogleTests)
 include(FindPackageRequired)
 include(IncludeWhatYouUse)
-include(UserverTestsuite)
+include(UserverVenv)
 include(UserverCodegenTarget)
 include(UserverGenerateComponentsSchemaDocs)
 include(UserverGenerateDynamicConfigsDocs)
@@ -212,6 +212,7 @@ if(USERVER_FEATURE_GRPC)
     include(SetupProtobuf)
 endif()
 
+include(UserverTestsuite)  # Uses protobuf version.
 if(USERVER_BUILD_TESTS)
     include(testsuite/SetupUserverTestsuiteEnv.cmake)
     add_subdirectory(testsuite)
diff --git a/cmake/DownloadUsingCPM.cmake b/cmake/DownloadUsingCPM.cmake
@@ -28,7 +28,15 @@ endif()
 # If A uses find_package(B), and we install A and B using CPM, then: 1. make sure to call write_package_stub in SetupB
 # 2. make sure to call SetupB at the beginning of SetupA
 function(write_package_stub PACKAGE_NAME)
-    file(WRITE "${CMAKE_BINARY_DIR}/package_stubs/${PACKAGE_NAME}Config.cmake" )
+    if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.24.0")
+        if(CPM_DONT_UPDATE_MODULE_PATH)
+            message(FATAL_ERROR "userver does not support CPM_DONT_UPDATE_MODULE_PATH=TRUE")
+        endif()
+    else()
+        # CPM with cmake<3.24 behaves badly for packages normally found via find_package(... CONFIG).
+        # This is an ugly workaround.
+        file(WRITE "${CMAKE_BINARY_DIR}/package_stubs/${PACKAGE_NAME}Config.cmake")
+    endif()
 endfunction()
 
 function(_list_subdirectories directory result_list)
diff --git a/cmake/ModuleHelpers.cmake b/cmake/ModuleHelpers.cmake
@@ -371,6 +371,7 @@ macro(_userver_cpm_addpackage name)
         NAME ${name}
         VERSION ${ARG_CPM_VERSION}
         GITHUB_REPOSITORY ${ARG_CPM_GITHUB_REPOSITORY}
+        GIT_SHALLOW TRUE
         URL ${ARG_CPM_URL}
         OPTIONS ${ARG_CPM_OPTIONS}
         SOURCE_SUBDIR ${ARG_CPM_SOURCE_SUBDIR}
diff --git a/cmake/SetupAbseil.cmake b/cmake/SetupAbseil.cmake
@@ -22,14 +22,15 @@ endif()
 include(DownloadUsingCPM)
 
 cpmaddpackage(
-    NAME abseil-cpp
+    NAME absl
     VERSION 20230802.1
     GIT_TAG 20230802.1
     GITHUB_REPOSITORY abseil/abseil-cpp
+    GIT_SHALLOW TRUE
     SYSTEM
     PATCHES abseil_pr_1707.patch abseil_pr_1739.patch
-    OPTIONS "ABSL_PROPAGATE_CXX_STD ON" "ABSL_ENABLE_INSTALL ON"
+    OPTIONS "ABSL_PROPAGATE_CXX_STD ON" "ABSL_ENABLE_INSTALL OFF"
 )
 
-mark_targets_as_system("${abseil-cpp_SOURCE_DIR}")
+mark_targets_as_system("${absl_SOURCE_DIR}")
 write_package_stub(absl)
diff --git a/cmake/SetupAmqpCPP.cmake b/cmake/SetupAmqpCPP.cmake
@@ -17,6 +17,7 @@ cpmaddpackage(
     NAME amqp-cpp
     VERSION 4.3.18
     GITHUB_REPOSITORY CopernicaMarketingSoftware/AMQP-CPP
+    GIT_SHALLOW TRUE
 )
 
 target_compile_options(amqpcpp PRIVATE "-Wno-unused-parameter")
diff --git a/cmake/SetupBrotli.cmake b/cmake/SetupBrotli.cmake
@@ -21,6 +21,7 @@ cpmaddpackage(
     NAME Brotli
     VERSION ${USERVER_BROTLI_VERSION}
     GITHUB_REPOSITORY google/brotli
+    GIT_SHALLOW TRUE
     OPTIONS "BROTLI_DISABLE_TESTS TRUE" "BUILD_SHARED_LIBS OFF"
 )
 
diff --git a/cmake/SetupCAres.cmake b/cmake/SetupCAres.cmake
@@ -20,6 +20,7 @@ cpmaddpackage(
     VERSION 1.19.0
     GITHUB_REPOSITORY c-ares/c-ares
     GIT_TAG cares-1_19_0
+    GIT_SHALLOW TRUE
     OPTIONS "CARES_INSTALL OFF" "CARES_BUILD_TOOLS OFF" "CARES_SHARED OFF" "CARES_STATIC ON"
 )
 
diff --git a/cmake/SetupCCTZ.cmake b/cmake/SetupCCTZ.cmake
@@ -19,6 +19,7 @@ cpmaddpackage(
     NAME cctz
     VERSION 2.3
     GITHUB_REPOSITORY google/cctz
+    GIT_SHALLOW TRUE
     OPTIONS "BUILD_TOOLS OFF" "BUILD_EXAMPLES OFF" "BUILD_TESTING OFF"
 )
 _userver_install_targets(COMPONENT universal TARGETS cctz)
diff --git a/cmake/SetupCURL.cmake b/cmake/SetupCURL.cmake
@@ -49,12 +49,14 @@ endif()
 
 include(DownloadUsingCPM)
 cpmaddpackage(
-    NAME curl
+    NAME CURL
     VERSION 7.81
     GITHUB_REPOSITORY curl/curl
     GIT_TAG curl-7_81_0
+    GIT_SHALLOW TRUE
     OPTIONS "BUILD_CURL_EXE OFF" "BUILD_SHARED_LIBS OFF" "CURL_DISABLE_TESTS ON" "CURL_DISABLE_LDAP ON"
-            "HAVE_DLOPEN TRUE" ${CURL_LTO_OPTION}
+            "HAVE_DLOPEN TRUE" "USE_NGHTTP2 TRUE"
+            "NGHTTP2_INCLUDE_DIR ${NGHTTP2_INCLUDE_DIR}" "NGHTTP2_LIBRARY ${NGHTTP2_LIBRARY}" ${CURL_LTO_OPTION}
 )
 
 mark_targets_as_system("${CURL_SOURCE_DIR}")
diff --git a/cmake/SetupCryptoPP.cmake b/cmake/SetupCryptoPP.cmake
@@ -24,7 +24,9 @@ cpmaddpackage(
     NAME cryptopp-cmake
     VERSION 8.9.0
     GITHUB_REPOSITORY abdes/cryptopp-cmake
-    GIT_TAG CRYPTOPP_8_9_0
+    # 8.9.0 is not enough, because cmake 3.30+ complains about FetchContent_Populate usage.
+    # We should use 8.10.0 tag instead as soon as it is released.
+    GIT_TAG d2b072ab65c036f3dca67f4204ad57d66728bf99
     OPTIONS "CRYPTOPP_BUILD_SHARED OFF" "CRYPTOPP_BUILD_TESTING OFF" "CRYPTOPP_USE_INTERMEDIATE_OBJECTS_TARGET OFF"
             "CRYPTOPP_USE_OPENMP OFF" "CRYPTOPP_DATA_DIR"
 )
diff --git a/cmake/SetupFmt.cmake b/cmake/SetupFmt.cmake
@@ -21,5 +21,6 @@ include(DownloadUsingCPM)
 cpmaddpackage(
     NAME fmt
     GIT_TAG 11.1.4
+    GIT_SHALLOW TRUE
     GITHUB_REPOSITORY fmtlib/fmt
 )
diff --git a/cmake/SetupGBench.cmake b/cmake/SetupGBench.cmake
@@ -25,6 +25,7 @@ cpmaddpackage(
     NAME benchmark
     VERSION ${UserverGBench_VERSION}
     GITHUB_REPOSITORY google/benchmark
+    GIT_SHALLOW TRUE
     OPTIONS "BENCHMARK_ENABLE_TESTING OFF" "BENCHMARK_ENABLE_WERROR OFF" "BENCHMARK_ENABLE_INSTALL OFF"
             "BENCHMARK_INSTALL_DOCS OFF" "BENCHMARK_ENABLE_GTEST_TESTS OFF"
 )
diff --git a/cmake/SetupGTest.cmake b/cmake/SetupGTest.cmake
@@ -44,6 +44,7 @@ cpmaddpackage(
     VERSION 1.14.0
     GIT_TAG v1.14.0
     GITHUB_REPOSITORY google/googletest
+    GIT_SHALLOW TRUE
     OPTIONS "INSTALL_GTEST OFF"
 )
 
diff --git a/cmake/SetupGoogleProtoApis.cmake b/cmake/SetupGoogleProtoApis.cmake
@@ -20,6 +20,7 @@ if(NOT EXISTS ${api-common-protos_SOURCE_DIR})
         NAME api-common-protos
         GITHUB_REPOSITORY googleapis/api-common-protos
         GIT_TAG main
+        GIT_SHALLOW TRUE
         DOWNLOAD_ONLY YES
     )
 endif()
diff --git a/cmake/SetupGrpc.cmake b/cmake/SetupGrpc.cmake
@@ -69,6 +69,7 @@ cpmaddpackage(
     NAME gRPC
     VERSION 1.59.1
     GITHUB_REPOSITORY grpc/grpc
+    GIT_SHALLOW TRUE
     SYSTEM
     PATCHES grpc_pr_36805.patch
     OPTIONS "BUILD_SHARED_LIBS OFF"
diff --git a/cmake/SetupOpentelemetryProto.cmake b/cmake/SetupOpentelemetryProto.cmake
@@ -9,6 +9,7 @@ if(NOT USERVER_OPENTELEMETRY_PROTO)
     cpmaddpackage(
         NAME opentelemetry_proto
         GITHUB_REPOSITORY open-telemetry/opentelemetry-proto
+        GIT_SHALLOW TRUE
         VERSION 1.3.2
         DOWNLOAD_ONLY
     )
diff --git a/cmake/SetupProtobuf.cmake b/cmake/SetupProtobuf.cmake
@@ -1,3 +1,7 @@
+# Duplicate gRPC's option definition here, otherwise it will always resolve to OFF, because gRPC is not yet configured
+# at this point.
+option(USERVER_DOWNLOAD_PACKAGE_GRPC "Download and setup gRPC" ${USERVER_DOWNLOAD_PACKAGES})
+
 option(USERVER_DOWNLOAD_PACKAGE_PROTOBUF "Download and setup Protobuf" ${USERVER_DOWNLOAD_PACKAGE_GRPC})
 option(USERVER_FORCE_DOWNLOAD_PROTOBUF "Download Protobuf even if there is an installed system package"
        ${USERVER_FORCE_DOWNLOAD_PACKAGES}
@@ -58,7 +62,11 @@ if(NOT USERVER_FORCE_DOWNLOAD_PROTOBUF)
 
     if(Protobuf_FOUND)
         _userver_set_protobuf_version_category()
-        set(PROTOBUF_PROTOC "${Protobuf_PROTOC_EXECUTABLE}")
+        if (Protobuf_PROTOC_EXECUTABLE)
+            set(PROTOBUF_PROTOC "${Protobuf_PROTOC_EXECUTABLE}")
+        elseif (TARGET protobuf::protoc)  # Newer protobuf versions outside Conan dropped additional cmake variable.
+            set(PROTOBUF_PROTOC $<TARGET_FILE:protobuf::protoc>)
+        endif()
         return()
     endif()
 endif()
@@ -70,12 +78,13 @@ cpmaddpackage(
     NAME Protobuf
     VERSION 4.24.4
     GITHUB_REPOSITORY protocolbuffers/protobuf
+    GIT_SHALLOW TRUE
     SYSTEM
     OPTIONS "protobuf_BUILD_SHARED_LIBS OFF" "protobuf_BUILD_TESTS OFF" "protobuf_INSTALL OFF"
             "protobuf_MSVC_STATIC_RUNTIME OFF" "protobuf_ABSL_PROVIDER package"
 )
 
-set(Protobuf_VERSION "${CPM_PACKAGE_Protobuf_VERSION}")
+set(Protobuf_VERSION "${CPM_PACKAGE_Protobuf_VERSION}" CACHE INTERNAL "")
 set(Protobuf_FOUND TRUE)
 set(PROTOBUF_INCLUDE_DIRS "${Protobuf_SOURCE_DIR}/src")
 set(Protobuf_INCLUDE_DIR "${Protobuf_SOURCE_DIR}/src")
diff --git a/cmake/SetupProtovalidate.cmake b/cmake/SetupProtovalidate.cmake
@@ -12,6 +12,7 @@ if(NOT USERVER_PROTOVALIDATE_CC_PATH AND USERVER_DOWNLOAD_PACKAGE_PROTOVALIDATE_
         NAME protovalidate_cc
         GIT_TAG v0.6.0
         GITHUB_REPOSITORY bufbuild/protovalidate-cc
+        GIT_SHALLOW TRUE
     )
 else()
     find_package(protovalidate_cc CONFIG REQUIRED)
diff --git a/cmake/SetupRdKafka.cmake b/cmake/SetupRdKafka.cmake
@@ -42,6 +42,7 @@ message(STATUS "Downloading librdkafka v${USERVER_KAFKA_VERSION}")
 cpmaddpackage(
     NAME RdKafka
     GITHUB_REPOSITORY confluentinc/librdkafka
+    GIT_SHALLOW TRUE
     VERSION ${USERVER_KAFKA_VERSION}
     OPTIONS "RDKAFKA_BUILD_STATIC ON"
             "RDKAFKA_BUILD_EXAMPLES OFF"
diff --git a/cmake/SetupRe2.cmake b/cmake/SetupRe2.cmake
@@ -22,6 +22,7 @@ cpmaddpackage(
     VERSION 2023-03-01 # newest version without abseil requirements
     GIT_TAG 2023-03-01
     GITHUB_REPOSITORY google/re2
+    GIT_SHALLOW TRUE
     SYSTEM
     OPTIONS "RE2_BUILD_TESTING OFF" "RE2_USE_ICU ON"
 )
diff --git a/cmake/SetupRocksDB.cmake b/cmake/SetupRocksDB.cmake
@@ -28,6 +28,7 @@ cpmaddpackage(
     NAME RocksDB
     GITHUB_REPOSITORY facebook/rocksdb
     GIT_TAG v10.4.2
+    GIT_SHALLOW TRUE
     OPTIONS "ROCKSDB_BUILD_SHARED OFF"
             "WITH_SNAPPY ON"
             "WITH_BZ2 ON"
diff --git a/cmake/SetupYdbCppSDK.cmake b/cmake/SetupYdbCppSDK.cmake
@@ -7,6 +7,7 @@ cpmaddpackage(
     NAME base64
     VERSION 0.5.2
     GITHUB_REPOSITORY aklomp/base64
+    GIT_SHALLOW TRUE
     OPTIONS "CMAKE_SKIP_INSTALL_RULES ON"
 )
 write_package_stub(base64)
@@ -16,11 +17,11 @@ cpmaddpackage(
     NAME jwt-cpp
     VERSION 0.7.0
     GITHUB_REPOSITORY Thalhammer/jwt-cpp
+    GIT_SHALLOW TRUE
     OPTIONS "JWT_BUILD_EXAMPLES OFF" "CMAKE_SKIP_INSTALL_RULES ON"
 )
 write_package_stub(jwt-cpp)
 
-write_package_stub(RapidJSON)
 set(RAPIDJSON_INCLUDE_DIRS "${USERVER_THIRD_PARTY_DIRS}/rapidjson/include")
 
 if(TARGET userver-api-common-protos)
@@ -34,6 +35,7 @@ cpmaddpackage(
     NAME ydb-cpp-sdk
     GIT_TAG v3.5.1
     GITHUB_REPOSITORY ydb-platform/ydb-cpp-sdk
+    GIT_SHALLOW TRUE
     OPTIONS "Brotli_VERSION ${Brotli_VERSION}" "RAPIDJSON_INCLUDE_DIRS ${RAPIDJSON_INCLUDE_DIRS}"
             "YDB_SDK_GOOGLE_COMMON_PROTOS_TARGET ${YDB_SDK_GOOGLE_COMMON_PROTOS_TARGET}" "YDB_SDK_EXAMPLES OFF"
 )
diff --git a/cmake/UserverGrpcTargets.cmake b/cmake/UserverGrpcTargets.cmake
@@ -51,8 +51,13 @@ function(_userver_prepare_grpc)
         set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${Protobuf_INCLUDE_DIRS}")
     elseif(protobuf_INCLUDE_DIRS)
         set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${protobuf_INCLUDE_DIRS}")
-    else()
-        message(FATAL_ERROR "Invalid Protobuf package")
+    else()  # Newer Protobuf versions outside Conan dropped all additional cmake variables.
+        get_target_property(Protobuf_INCLUDE_DIR protobuf::libprotobuf INTERFACE_INCLUDE_DIRECTORIES)
+        if (Protobuf_INCLUDE_DIR)
+            set_property(GLOBAL PROPERTY userver_protobuf_import_dir "${Protobuf_INCLUDE_DIR}")
+        else()
+            message(FATAL_ERROR "Invalid Protobuf package")
+        endif()
     endif()
 
     if(NOT Protobuf_VERSION)
diff --git a/cmake/modules/FindRapidJSON.cmake b/cmake/modules/FindRapidJSON.cmake
@@ -0,0 +1 @@
+# userver provides the necessary targets.
diff --git a/cmake/modules/Findlibnghttp2.cmake b/cmake/modules/Findlibnghttp2.cmake
@@ -25,3 +25,20 @@ if(NOT TARGET libnghttp2::nghttp2)
         message(FATAL_ERROR "libnghttp2{,_static} cmake target not found, don't know how to link")
     endif()
 endif()
+
+if(CPM_PACKAGE_libnghttp2_SOURCE_DIR)
+    # CPM-downloaded CURL does not find CPM-downloaded libnghttp2 automatically.
+    set(nghttp2_combined_include_dir ${CPM_PACKAGE_libnghttp2_BINARY_DIR}/combined_includes)
+    add_custom_target(
+        userver-libnghttp2-curl-bridge
+        COMMAND ${CMAKE_COMMAND} -E make_directory "${nghttp2_combined_include_dir}"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CPM_PACKAGE_libnghttp2_SOURCE_DIR}/lib/includes" "${nghttp2_combined_include_dir}"
+        COMMAND ${CMAKE_COMMAND} -E copy_directory "${CPM_PACKAGE_libnghttp2_BINARY_DIR}/lib/includes" "${nghttp2_combined_include_dir}"
+        COMMENT "Copying libnghttp2 includes to a directory consumable by CURL"
+        VERBATIM
+    )
+    get_target_property(nghttp2_original_target libnghttp2::nghttp2 ALIASED_TARGET)
+    add_dependencies(${nghttp2_original_target} userver-libnghttp2-curl-bridge)
+    set(NGHTTP2_INCLUDE_DIR "${nghttp2_combined_include_dir}" CACHE INTERNAL "" FORCE)
+    set(NGHTTP2_LIBRARY "$<TARGET_FILE:libnghttp2::nghttp2>" CACHE INTERNAL "" FORCE)
+endif()
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
@@ -188,18 +188,12 @@ if(CMAKE_SYSTEM_NAME MATCHES "Darwin" AND CMAKE_SYSTEM_PROCESSOR MATCHES "arm64"
     endif()
 endif()
 
-if("${Boost_VERSION_STRING}" VERSION_LESS "1.88.0")
-    option(USERVER_FEATURE_UBOOST_CORO "Use vendored boost context instead of a system one"
-           "${USERVER_UBOOST_CORO_DEFAULT}"
-    )
-else()
-    message(
-        STATUS
-            "Found a modern Boost version (${Boost_VERSION_STRING}), not using vendored Boost::context and Boost::coroutine2"
-    )
-    set(USERVER_FEATURE_UBOOST_CORO OFF)
+if("${Boost_VERSION_STRING}" VERSION_GREATER_EQUAL "1.88.0")
+    set(USERVER_UBOOST_CORO_DEFAULT OFF)
 endif()
 
+option(USERVER_FEATURE_UBOOST_CORO "Use vendored boost context instead of a system one" ${USERVER_UBOOST_CORO_DEFAULT})
+
 if(USERVER_FEATURE_UBOOST_CORO)
     add_subdirectory(${USERVER_THIRD_PARTY_DIRS}/uboost_coro uboost_coro_build)
     target_link_libraries(${PROJECT_NAME} PRIVATE userver-uboost-coro)
diff --git a/core/benchmarks/main.cpp b/core/benchmarks/main.cpp
@@ -3,10 +3,16 @@
 #include <userver/logging/log.hpp>
 #include <userver/utils/impl/static_registration.hpp>
 
+namespace benchmark {
+
+// MaybeReenterWithoutASLR appeared in Google benchmark 1.9.3. Do nothing for older versions.
+template <typename... Args>
+static void MaybeReenterWithoutASLR(Args&&...) {}
+
+}  // namespace benchmark
+
 int main(int argc, char** argv) {
-#ifndef USERVER_IMPL_NO_MAYBE_REENTER_WITHOUT_ASLR_EXISTS
     ::benchmark::MaybeReenterWithoutASLR(argc, argv);
-#endif
 
     USERVER_NAMESPACE::utils::impl::FinishStaticRegistration();
 
diff --git a/service_template/cmake/DownloadUserver.cmake b/service_template/cmake/DownloadUserver.cmake
@@ -36,6 +36,7 @@ function(download_userver)
         ${ARG_VERSION}
         GIT_TAG
         ${ARG_GIT_TAG}
+        GIT_SHALLOW TRUE
         ${ARG_UNPARSED_ARGUMENTS}
     )
 endfunction()
diff --git a/universal/CMakeLists.txt b/universal/CMakeLists.txt
diff --git a/universal/benchmarks/main_check_aslr_disable.cpp b/universal/benchmarks/main_check_aslr_disable.cpp

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ cpmaddpackage(`
`17`	`17`	`NAME amqp-cpp`
`18`	`18`	`VERSION 4.3.18`
`19`	`19`	`GITHUB_REPOSITORY CopernicaMarketingSoftware/AMQP-CPP`
	`20`	`+ GIT_SHALLOW TRUE`
`20`	`21`	`)`
`21`	`22`
`22`	`23`	`target_compile_options(amqpcpp PRIVATE "-Wno-unused-parameter")`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ cpmaddpackage(`
`21`	`21`	`NAME Brotli`
`22`	`22`	`VERSION ${USERVER_BROTLI_VERSION}`
`23`	`23`	`GITHUB_REPOSITORY google/brotli`
	`24`	`+ GIT_SHALLOW TRUE`
`24`	`25`	`OPTIONS "BROTLI_DISABLE_TESTS TRUE" "BUILD_SHARED_LIBS OFF"`
`25`	`26`	`)`
`26`	`27`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@ cpmaddpackage(`
`20`	`20`	`VERSION 1.19.0`
`21`	`21`	`GITHUB_REPOSITORY c-ares/c-ares`
`22`	`22`	`GIT_TAG cares-1_19_0`
	`23`	`+ GIT_SHALLOW TRUE`
`23`	`24`	`OPTIONS "CARES_INSTALL OFF" "CARES_BUILD_TOOLS OFF" "CARES_SHARED OFF" "CARES_STATIC ON"`
`24`	`25`	`)`
`25`	`26`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ cpmaddpackage(`
`19`	`19`	`NAME cctz`
`20`	`20`	`VERSION 2.3`
`21`	`21`	`GITHUB_REPOSITORY google/cctz`
	`22`	`+ GIT_SHALLOW TRUE`
`22`	`23`	`OPTIONS "BUILD_TOOLS OFF" "BUILD_EXAMPLES OFF" "BUILD_TESTING OFF"`
`23`	`24`	`)`
`24`	`25`	`_userver_install_targets(COMPONENT universal TARGETS cctz)`