diff options
| author | levlam <levlam@telegram.org> | 2022-03-14 16:20:56 +0300 |
|---|---|---|
| committer | levlam <levlam@telegram.org> | 2022-03-14 16:20:56 +0300 |
| commit | ccf2da28650d8d1db8514855ca847550a3b2267a (patch) | |
| tree | d4196e2acd8d3ecbb26ebe6bb4bf2937746d3b62 | |
| parent | f9efb87f7d4d5adaafc0826a27ed6a023a015904 (diff) | |
Move find_package(ABSL) under TD_WITH_ABSEIL.
| -rw-r--r-- | benchmark/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tdutils/CMakeLists.txt | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/benchmark/CMakeLists.txt b/benchmark/CMakeLists.txt index 6e981abc0..53fbdede5 100644 --- a/benchmark/CMakeLists.txt +++ b/benchmark/CMakeLists.txt @@ -73,7 +73,7 @@ if (NOT WIN32 AND NOT CYGWIN) target_link_libraries(bench_queue PRIVATE tdutils) endif() -if (TD_TEST_FOLLY) +if (TD_TEST_FOLLY AND TD_WITH_ABSEIL) find_package(ABSL QUIET) find_package(folly QUIET) find_package(gflags QUIET) diff --git a/tdutils/CMakeLists.txt b/tdutils/CMakeLists.txt index 5dcdb4560..3fcb887c5 100644 --- a/tdutils/CMakeLists.txt +++ b/tdutils/CMakeLists.txt @@ -28,9 +28,11 @@ if (CRC32C_FOUND) set(TD_HAVE_CRC32C 1) endif() -find_package(ABSL QUIET) -if (ABSL_FOUND) - set(TD_HAVE_ABSL 1) +if (TD_WITH_ABSEIL) + find_package(ABSL QUIET) + if (ABSL_FOUND) + set(TD_HAVE_ABSL 1) + endif() endif() configure_file(td/utils/config.h.in td/utils/config.h @ONLY) @@ -395,12 +397,12 @@ install(TARGETS tdutils EXPORT TdTargets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" ) -if (TD_TEST_FOLLY) +if (TD_TEST_FOLLY AND ABSL_FOUND) find_package(benchmark QUIET) find_package(folly QUIET) find_package(gflags QUIET) - if (ABSL_FOUND AND benchmark_FOUND AND folly_FOUND) + if (benchmark_FOUND AND folly_FOUND) add_executable(benchmark-hashset test/hashset_benchmark.cpp) target_link_libraries(benchmark-hashset PRIVATE tdutils benchmark::benchmark Folly::folly absl::flat_hash_map absl::hash) endif() |