tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move find_package(ABSL) under TD_WITH_ABSEIL.

Browse Source
This commit is contained in:
levlam 2022-03-14 16:20:56 +03:00
parent f9efb87f7d
commit ccf2da2865
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/CMakeLists.txt
View File

@ -73,7 +73,7 @@ if (NOT WIN32 AND NOT CYGWIN)
target_link_libraries(bench_queue PRIVATE tdutils) target_link_libraries(bench_queue PRIVATE tdutils)
endif() endif()
if (TD_TEST_FOLLY) if (TD_TEST_FOLLY AND TD_WITH_ABSEIL)
find_package(ABSL QUIET) find_package(ABSL QUIET)
find_package(folly QUIET) find_package(folly QUIET)
find_package(gflags QUIET) find_package(gflags QUIET)

6
tdutils/CMakeLists.txt
View File

@ -28,10 +28,12 @@ if (CRC32C_FOUND)
set(TD_HAVE_CRC32C 1) set(TD_HAVE_CRC32C 1)
endif() endif()
if (TD_WITH_ABSEIL)
find_package(ABSL QUIET) find_package(ABSL QUIET)
if (ABSL_FOUND) if (ABSL_FOUND)
set(TD_HAVE_ABSL 1) set(TD_HAVE_ABSL 1)
endif() endif()
endif()
configure_file(td/utils/config.h.in td/utils/config.h @ONLY) 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}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
) )
if (TD_TEST_FOLLY) if (TD_TEST_FOLLY AND ABSL_FOUND)
find_package(benchmark QUIET) find_package(benchmark QUIET)
find_package(folly QUIET) find_package(folly QUIET)
find_package(gflags 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) 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) target_link_libraries(benchmark-hashset PRIVATE tdutils benchmark::benchmark Folly::folly absl::flat_hash_map absl::hash)
endif() endif()