Changeset: c0da459faabb for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c0da459faabb
Modified Files:
cmake/Modules/FindLZ4.cmake
cmake/monetdb-findpackages.cmake
ctest/cmake/detect-fits.cmake
ctest/cmake/detect-lz4.cmake
ctest/cmake/detect-pthreadkill.cmake
ctest/cmake/detect-pthreadsig.cmake
ctest/cmake/detect-readline.cmake
Branch: default
Log Message:
handle lz4 version the correct way
diffs (117 lines):
diff --git a/cmake/Modules/FindLZ4.cmake b/cmake/Modules/FindLZ4.cmake
--- a/cmake/Modules/FindLZ4.cmake
+++ b/cmake/Modules/FindLZ4.cmake
@@ -6,23 +6,26 @@
# LZ4_VERSION - LZ4_VERSION if found
# LZ4_FOUND - True if lz4 found.
+include(FindPackageHandleStandardArgs)
+
find_path(LZ4_INCLUDE_DIR NAMES lz4.h)
-
find_library(LZ4_LIBRARIES NAMES lz4)
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LZ4
- DEFAULT_MSG
- LZ4_LIBRARIES
- LZ4_INCLUDE_DIR)
-
-if(LZ4_FOUND)
+if(LZ4_INCLUDE_DIR AND EXISTS "${LZ4_INCLUDE_DIR}/lz4.h")
file(STRINGS "${LZ4_INCLUDE_DIR}/lz4.h" LZ4_VERSION_LINES REGEX "#define[
\t]+LZ4_VERSION_(MAJOR|MINOR|RELEASE)")
string(REGEX REPLACE ".*LZ4_VERSION_MAJOR *\([0-9]*\).*" "\\1"
LZ4_VERSION_MAJOR "${LZ4_VERSION_LINES}")
string(REGEX REPLACE ".*LZ4_VERSION_MINOR *\([0-9]*\).*" "\\1"
LZ4_VERSION_MINOR "${LZ4_VERSION_LINES}")
string(REGEX REPLACE ".*LZ4_VERSION_RELEASE *\([0-9]*\).*" "\\1"
LZ4_VERSION_RELEASE "${LZ4_VERSION_LINES}")
set(LZ4_VERSION
"${LZ4_VERSION_MAJOR}.${LZ4_VERSION_MINOR}.${LZ4_VERSION_RELEASE}")
+endif()
+find_package_handle_standard_args(LZ4
+ REQUIRED_VARS
+ LZ4_LIBRARIES
+ LZ4_INCLUDE_DIR
+ VERSION_VAR LZ4_VERSION)
+
+if(LZ4_FOUND)
if(NOT TARGET LZ4::LZ4 AND
(EXISTS "${LZ4_LIBRARIES}"))
add_library(LZ4::LZ4 UNKNOWN IMPORTED)
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -55,10 +55,7 @@ if(WITH_ZLIB)
endif()
if(WITH_LZ4)
- find_package(LZ4)
- if (LZ4_FOUND AND LZ4_VERSION VERSION_LESS "1.8.0")
- unset(LZ4_FOUND)
- endif()
+ find_package(LZ4 1.8.0)
endif()
if(WITH_PROJ)
diff --git a/ctest/cmake/detect-fits.cmake b/ctest/cmake/detect-fits.cmake
--- a/ctest/cmake/detect-fits.cmake
+++ b/ctest/cmake/detect-fits.cmake
@@ -13,7 +13,7 @@ endif()
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_FITS
variablename CFITSIO_FOUND)
endif()
diff --git a/ctest/cmake/detect-lz4.cmake b/ctest/cmake/detect-lz4.cmake
--- a/ctest/cmake/detect-lz4.cmake
+++ b/ctest/cmake/detect-lz4.cmake
@@ -15,7 +15,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "10")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_LIBLZ4
variablename LZ4_FOUND)
endif()
diff --git a/ctest/cmake/detect-pthreadkill.cmake
b/ctest/cmake/detect-pthreadkill.cmake
--- a/ctest/cmake/detect-pthreadkill.cmake
+++ b/ctest/cmake/detect-pthreadkill.cmake
@@ -12,8 +12,8 @@ endif()
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
- set(DETECT "0")
- set(UNDETECT "1")
+ set(DETECT "1")
+ set(UNDETECT "0")
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "10")
set(DETECT "1")
diff --git a/ctest/cmake/detect-pthreadsig.cmake
b/ctest/cmake/detect-pthreadsig.cmake
--- a/ctest/cmake/detect-pthreadsig.cmake
+++ b/ctest/cmake/detect-pthreadsig.cmake
@@ -12,8 +12,8 @@ endif()
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
- set(DETECT "0")
- set(UNDETECT "1")
+ set(DETECT "1")
+ set(UNDETECT "0")
endif()
if(${LINUX_DISTRO_VERSION} STREQUAL "10")
set(DETECT "1")
diff --git a/ctest/cmake/detect-readline.cmake
b/ctest/cmake/detect-readline.cmake
--- a/ctest/cmake/detect-readline.cmake
+++ b/ctest/cmake/detect-readline.cmake
@@ -13,7 +13,7 @@ endif()
if (${LINUX_DISTRO} STREQUAL "debian")
if(${LINUX_DISTRO_VERSION} STREQUAL "9")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_READLINE
variablename READLINE_FOUND)
endif()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
