From 262774e504c518b8de7bd4202a76d673b1d14fa6 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Wed, 22 Dec 2021 23:28:07 +0400 Subject: [PATCH] Use pkg-config to find xxhash --- external/xxhash/CMakeLists.txt | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/external/xxhash/CMakeLists.txt b/external/xxhash/CMakeLists.txt index b3a721b..93e3ffd 100644 --- a/external/xxhash/CMakeLists.txt +++ b/external/xxhash/CMakeLists.txt @@ -8,23 +8,21 @@ add_library(external_xxhash INTERFACE IMPORTED GLOBAL) add_library(desktop-app::external_xxhash ALIAS external_xxhash) if (DESKTOP_APP_USE_PACKAGED) - find_library(XXHASH_LIBRARY xxhash) - find_path(XXHASH_INCLUDE_DIRS xxhash.h) + find_package(PkgConfig REQUIRED) + pkg_check_modules(XXHASH IMPORTED_TARGET libxxhash) - if (XXHASH_LIBRARY AND XXHASH_INCLUDE_DIRS) - target_include_directories(external_xxhash SYSTEM INTERFACE ${XXHASH_INCLUDE_DIRS}) - target_link_libraries(external_xxhash INTERFACE ${XXHASH_LIBRARY}) + if (XXHASH_FOUND) + target_link_libraries(external_xxhash INTERFACE PkgConfig::XXHASH) + return() endif() endif() -if (NOT XXHASH_LIBRARY OR NOT XXHASH_INCLUDE_DIRS) - target_include_directories(external_xxhash SYSTEM - INTERFACE - ${third_party_loc}/xxHash - ) +target_include_directories(external_xxhash SYSTEM +INTERFACE + ${third_party_loc}/xxHash +) - target_compile_definitions(external_xxhash - INTERFACE - XXH_INLINE_ALL - ) -endif() +target_compile_definitions(external_xxhash +INTERFACE + XXH_INLINE_ALL +)