Changeset: 11bd7575725e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=11bd7575725e
Modified Files:
ctest/cmake/detect-bz2.cmake
ctest/cmake/detect-commoncrypto.cmake
ctest/cmake/detect-curl.cmake
ctest/cmake/detect-fits.cmake
ctest/cmake/detect-gdal.cmake
ctest/cmake/detect-geos.cmake
ctest/cmake/detect-getaddrinfo.cmake
ctest/cmake/detect-iconv.cmake
ctest/cmake/detect-libpy3.cmake
ctest/cmake/detect-libr.cmake
ctest/cmake/detect-libz.cmake
ctest/cmake/detect-lz4.cmake
ctest/cmake/detect-lzma.cmake
ctest/cmake/detect-netcdf.cmake
ctest/cmake/detect-openssl.cmake
ctest/cmake/detect-pcre.cmake
ctest/cmake/detect-proj.cmake
ctest/cmake/detect-pthreadh.cmake
ctest/cmake/detect-pthreadinit.cmake
ctest/cmake/detect-pthreadkill.cmake
ctest/cmake/detect-pthreadsig.cmake
ctest/cmake/detect-readline.cmake
ctest/cmake/detect-snappy.cmake
ctest/cmake/detect-unixgetaddrinfo.cmake
ctest/cmake/detect-uuid.cmake
ctest/cmake/detect-valgrind.cmake
ctest/cmake/detect-wingetaddrinfo.cmake
ctest/cmake/detect-xml.cmake
Branch: Oct2020
Log Message:
make sure we can test detected flags on ubuntu
diffs (truncated from 651 to 300 lines):
diff --git a/ctest/cmake/detect-bz2.cmake b/ctest/cmake/detect-bz2.cmake
--- a/ctest/cmake/detect-bz2.cmake
+++ b/ctest/cmake/detect-bz2.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename BZIP2_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBBZ2
- variablename BZIP2_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBBZ2
- variablename BZIP2_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_LIBBZ2
diff --git a/ctest/cmake/detect-commoncrypto.cmake
b/ctest/cmake/detect-commoncrypto.cmake
--- a/ctest/cmake/detect-commoncrypto.cmake
+++ b/ctest/cmake/detect-commoncrypto.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename COMMONCRYPTO_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_COMMONCRYPTO
- variablename COMMONCRYPTO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_COMMONCRYPTO
- variablename COMMONCRYPTO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_COMMONCRYPTO
diff --git a/ctest/cmake/detect-curl.cmake b/ctest/cmake/detect-curl.cmake
--- a/ctest/cmake/detect-curl.cmake
+++ b/ctest/cmake/detect-curl.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename CURL_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_CURL
- variablename CURL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_CURL
- variablename CURL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_CURL
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
@@ -24,19 +24,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename CFITSIO_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_FITS
- variablename CFITSIO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_FITS
- variablename CFITSIO_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_FITS
diff --git a/ctest/cmake/detect-gdal.cmake b/ctest/cmake/detect-gdal.cmake
--- a/ctest/cmake/detect-gdal.cmake
+++ b/ctest/cmake/detect-gdal.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename GDAL_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_SHP
- variablename GDAL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_SHP
- variablename GDAL_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_SHP
diff --git a/ctest/cmake/detect-geos.cmake b/ctest/cmake/detect-geos.cmake
--- a/ctest/cmake/detect-geos.cmake
+++ b/ctest/cmake/detect-geos.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename GEOS_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_GEOM
- variablename GEOS_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_GEOM
- variablename GEOS_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_GEOM
diff --git a/ctest/cmake/detect-getaddrinfo.cmake
b/ctest/cmake/detect-getaddrinfo.cmake
--- a/ctest/cmake/detect-getaddrinfo.cmake
+++ b/ctest/cmake/detect-getaddrinfo.cmake
@@ -20,15 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
set(UNDETECT "1")
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- set(DETECT "0")
- set(UNDETECT "1")
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
set(DETECT "0")
set(UNDETECT "1")
endif()
diff --git a/ctest/cmake/detect-iconv.cmake b/ctest/cmake/detect-iconv.cmake
--- a/ctest/cmake/detect-iconv.cmake
+++ b/ctest/cmake/detect-iconv.cmake
@@ -20,24 +20,18 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename Iconv_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "20")
assert_package_detected(
- detect FALSE
+ detect TRUE
legacyvariable HAVE_ICONV
variablename Iconv_FOUND)
endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_ICONV
variablename Iconv_FOUND)
endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
- assert_package_detected(
- detect TRUE
- legacyvariable HAVE_ICONV
- variablename Iconv_FOUND)
- endif()
elseif(${LINUX_DISTRO} STREQUAL "fedora")
if(${LINUX_DISTRO_VERSION} STREQUAL "30")
assert_package_detected(
diff --git a/ctest/cmake/detect-libpy3.cmake b/ctest/cmake/detect-libpy3.cmake
--- a/ctest/cmake/detect-libpy3.cmake
+++ b/ctest/cmake/detect-libpy3.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename Python3_NumPy_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBPY3
- variablename Python3_NumPy_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBPY3
- variablename Python3_NumPy_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_LIBPY3
diff --git a/ctest/cmake/detect-libr.cmake b/ctest/cmake/detect-libr.cmake
--- a/ctest/cmake/detect-libr.cmake
+++ b/ctest/cmake/detect-libr.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename LIBR_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBR
- variablename LIBR_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBR
- variablename LIBR_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_LIBR
diff --git a/ctest/cmake/detect-libz.cmake b/ctest/cmake/detect-libz.cmake
--- a/ctest/cmake/detect-libz.cmake
+++ b/ctest/cmake/detect-libz.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename ZLIB_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBZ
- variablename ZLIB_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBZ
- variablename ZLIB_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_LIBZ
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
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename LZ4_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBLZ4
- variablename LZ4_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "19")
- assert_package_detected(
- detect FALSE
- legacyvariable HAVE_LIBLZ4
- variablename LZ4_FOUND)
- endif()
- if(${LINUX_DISTRO_VERSION} STREQUAL "20")
+ if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
assert_package_detected(
detect FALSE
legacyvariable HAVE_LIBLZ4
diff --git a/ctest/cmake/detect-lzma.cmake b/ctest/cmake/detect-lzma.cmake
--- a/ctest/cmake/detect-lzma.cmake
+++ b/ctest/cmake/detect-lzma.cmake
@@ -20,19 +20,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
variablename LIBLZMA_FOUND)
endif()
elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
- if(${LINUX_DISTRO_VERSION} STREQUAL "18")
- assert_package_detected(
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
