1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Locate zstd using CONFIG

Browse Source 
Trying to locate zstd package configuration prior to use pkg-config.

Define explicit IMPORTED_LOCATION_DEBUG and IMPORTED_LOCATION_RELEASE
in case of pkg-config usage.

Fixes: QTBUG-88091
Change-Id: I3cb86a66fad4e7b78b3d2fcff061508fc25e25a7
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Alexey Edelev 2020-11-06 12:06:23 +01:00
parent a66e5a3eca
commit 2433e5804c
1 changed files with 52 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
cmake/FindZSTD.cmake
View File

@ -18,32 +18,62 @@
# ``ZSTD::ZSTD`` # ``ZSTD::ZSTD``
# The zstd library # The zstd library
find_package(PkgConfig QUIET) find_package(zstd CONFIG)
pkg_check_modules(PC_ZSTD QUIET libzstd)
find_path(ZSTD_INCLUDE_DIRS include(FindPackageHandleStandardArgs)
if(TARGET zstd::libzstd_static OR TARGET zstd::libzstd_shared)
find_package_handle_standard_args(ZSTD REQUIRED_VARS zstd_DIR VERSION_VAR zstd_VERSION)
if(TARGET zstd::libzstd_static)
set(zstdtargetsuffix "_static")
else()
set(zstdtargetsuffix "_shared")
endif()
if(NOT TARGET ZSTD::ZSTD)
add_library(ZSTD::ZSTD INTERFACE IMPORTED)
set_target_properties(ZSTD::ZSTD PROPERTIES
INTERFACE_LINK_LIBRARIES "zstd::libzstd${zstdtargetsuffix}")
endif()
else()
find_package(PkgConfig QUIET)
pkg_check_modules(PC_ZSTD QUIET libzstd)
find_path(ZSTD_INCLUDE_DIRS
NAMES zstd.h NAMES zstd.h
HINTS ${PC_ZSTD_INCLUDEDIR} HINTS ${PC_ZSTD_INCLUDEDIR}
PATH_SUFFIXES zstd) PATH_SUFFIXES zstd)
find_library(ZSTD_LIBRARIES find_library(ZSTD_LIBRARY_RELEASE
NAMES zstd zstd_static NAMES zstd zstd_static
HINTS ${PC_ZSTD_LIBDIR} HINTS ${PC_ZSTD_LIBDIR}
) )
find_library(ZSTD_LIBRARY_DEBUG
NAMES zstdd zstd_staticd zstd zstd_static
HINTS ${PC_ZSTD_LIBDIR}
)
include(FindPackageHandleStandardArgs) include(SelectLibraryConfigurations)
find_package_handle_standard_args(ZSTD REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS select_library_configurations(ZSTD)
find_package_handle_standard_args(ZSTD REQUIRED_VARS ZSTD_LIBRARIES ZSTD_INCLUDE_DIRS
VERSION_VAR PC_ZSTD_VERSION) VERSION_VAR PC_ZSTD_VERSION)
if(ZSTD_FOUND AND NOT TARGET ZSTD::ZSTD) if(ZSTD_FOUND AND NOT TARGET ZSTD::ZSTD)
add_library(ZSTD::ZSTD UNKNOWN IMPORTED) add_library(ZSTD::ZSTD UNKNOWN IMPORTED)
set_target_properties(ZSTD::ZSTD PROPERTIES set_target_properties(ZSTD::ZSTD PROPERTIES
IMPORTED_LOCATION "${ZSTD_LIBRARIES}"
INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIRS}") INTERFACE_INCLUDE_DIRECTORIES "${ZSTD_INCLUDE_DIRS}")
if(ZSTD_LIBRARY_RELEASE)
set_target_properties(ZSTD::ZSTD PROPERTIES
IMPORTED_LOCATION_RELEASE "${ZSTD_LIBRARY_RELEASE}")
endif()
if(ZSTD_LIBRARY_DEBUG)
set_target_properties(ZSTD::ZSTD PROPERTIES
IMPORTED_LOCATION_DEBUG "${ZSTD_LIBRARY_DEBUG}")
endif()
endif()
mark_as_advanced(ZSTD_INCLUDE_DIRS ZSTD_LIBRARIES ZSTD_LIBRARY_RELEASE ZSTD_LIBRARY_DEBUG)
endif() endif()
mark_as_advanced(ZSTD_INCLUDE_DIRS ZSTD_LIBRARIES)
include(FeatureSummary) include(FeatureSummary)
set_package_properties(ZSTD PROPERTIES set_package_properties(ZSTD PROPERTIES
URL "https://github.com/facebook/zstd" URL "https://github.com/facebook/zstd"