From 92ac2f509915b73198d7f7beef6ede11983df524 Mon Sep 17 00:00:00 2001 From: Dario Lombardo Date: Wed, 28 Aug 2019 09:52:12 +0200 Subject: cmake: fix issue when zstd is missing. We need to check the library version only when the it's present, otherwise we hit an error. Change-Id: I6323b19d0023d466bfb6ae4b5751f376fc213fa4 Reviewed-on: https://code.wireshark.org/review/34387 Petri-Dish: Dario Lombardo Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman Reviewed-by: Gerald Combs --- cmake/modules/FindZSTD.cmake | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/cmake/modules/FindZSTD.cmake b/cmake/modules/FindZSTD.cmake index 54f9281869..3fefe0fa08 100644 --- a/cmake/modules/FindZSTD.cmake +++ b/cmake/modules/FindZSTD.cmake @@ -31,16 +31,18 @@ find_library(ZSTD_LIBRARY /usr/local/lib ) -file(STRINGS ${ZSTD_INCLUDE_DIR}/zstd.h ZSTD_VERSION_MAJOR - REGEX "#define[ ]+ZSTD_VERSION_MAJOR[ ]+[0-9]+") -string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MAJOR ${ZSTD_VERSION_MAJOR}) -file(STRINGS ${ZSTD_INCLUDE_DIR}/zstd.h ZSTD_VERSION_MINOR - REGEX "#define[ ]+ZSTD_VERSION_MINOR[ ]+[0-9]+") -string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MINOR ${ZSTD_VERSION_MINOR}) -file(STRINGS ${ZSTD_INCLUDE_DIR}/zstd.h ZSTD_VERSION_RELEASE - REGEX "#define[ ]+ZSTD_VERSION_RELEASE[ ]+[0-9]+") -string(REGEX MATCH "[0-9]+" ZSTD_VERSION_RELEASE ${ZSTD_VERSION_RELEASE}) -set(ZSTD_VERSION ${ZSTD_VERSION_MAJOR}.${ZSTD_VERSION_MINOR}.${ZSTD_VERSION_RELEASE}) +if( ZSTD_INCLUDE_DIR AND ZSTD_LIBRARY ) + file(STRINGS ${ZSTD_INCLUDE_DIR}/zstd.h ZSTD_VERSION_MAJOR + REGEX "#define[ ]+ZSTD_VERSION_MAJOR[ ]+[0-9]+") + string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MAJOR ${ZSTD_VERSION_MAJOR}) + file(STRINGS ${ZSTD_INCLUDE_DIR}/zstd.h ZSTD_VERSION_MINOR + REGEX "#define[ ]+ZSTD_VERSION_MINOR[ ]+[0-9]+") + string(REGEX MATCH "[0-9]+" ZSTD_VERSION_MINOR ${ZSTD_VERSION_MINOR}) + file(STRINGS ${ZSTD_INCLUDE_DIR}/zstd.h ZSTD_VERSION_RELEASE + REGEX "#define[ ]+ZSTD_VERSION_RELEASE[ ]+[0-9]+") + string(REGEX MATCH "[0-9]+" ZSTD_VERSION_RELEASE ${ZSTD_VERSION_RELEASE}) + set(ZSTD_VERSION ${ZSTD_VERSION_MAJOR}.${ZSTD_VERSION_MINOR}.${ZSTD_VERSION_RELEASE}) +endif() include(FindPackageHandleStandardArgs) find_package_handle_standard_args(ZSTD -- cgit v1.2.3