MonetDB: Oct2020 - improved detection checks on ubuntu 18+

[Niels Nes]

Changeset: 9929eaa95a9f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9929eaa95a9f
Modified Files:
        ctest/cmake/detect-iconv.cmake
        ctest/cmake/detect-libz.cmake
        ctest/cmake/detect-openssl.cmake
        ctest/cmake/detect-pcre.cmake
        ctest/cmake/detect-uuid.cmake
        ctest/cmake/detect-xml.cmake
Branch: Oct2020
Log Message:

improved detection checks on ubuntu 18+


diffs (83 lines):

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,18 +20,12 @@ if (${LINUX_DISTRO} STREQUAL "debian")
       variablename Iconv_FOUND)
   endif()
 elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
-  if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "20")
+  if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
     assert_package_detected(
       detect TRUE
       legacyvariable HAVE_ICONV
       variablename Iconv_FOUND)
   endif()
-  if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
-    assert_package_detected(
-      detect FALSE
-      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-libz.cmake b/ctest/cmake/detect-libz.cmake
--- a/ctest/cmake/detect-libz.cmake
+++ b/ctest/cmake/detect-libz.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
 elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
   if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
     assert_package_detected(
-      detect FALSE
+      detect TRUE
       legacyvariable HAVE_LIBZ
       variablename ZLIB_FOUND)
   endif()
diff --git a/ctest/cmake/detect-openssl.cmake b/ctest/cmake/detect-openssl.cmake
--- a/ctest/cmake/detect-openssl.cmake
+++ b/ctest/cmake/detect-openssl.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
 elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
   if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
     assert_package_detected(
-      detect FALSE
+      detect TRUE
       legacyvariable HAVE_OPENSSL
       variablename OPENSSL_FOUND)
   endif()
diff --git a/ctest/cmake/detect-pcre.cmake b/ctest/cmake/detect-pcre.cmake
--- a/ctest/cmake/detect-pcre.cmake
+++ b/ctest/cmake/detect-pcre.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
 elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
   if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
     assert_package_detected(
-      detect FALSE
+      detect TRUE
       legacyvariable HAVE_LIBPCRE
       variablename PCRE_FOUND)
   endif()
diff --git a/ctest/cmake/detect-uuid.cmake b/ctest/cmake/detect-uuid.cmake
--- a/ctest/cmake/detect-uuid.cmake
+++ b/ctest/cmake/detect-uuid.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
 elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
   if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
     assert_package_detected(
-      detect FALSE
+      detect TRUE
       legacyvariable HAVE_UUID
       variablename HAVE_UUID_GENERATE)
   endif()
diff --git a/ctest/cmake/detect-xml.cmake b/ctest/cmake/detect-xml.cmake
--- a/ctest/cmake/detect-xml.cmake
+++ b/ctest/cmake/detect-xml.cmake
@@ -22,7 +22,7 @@ if (${LINUX_DISTRO} STREQUAL "debian")
 elseif (${LINUX_DISTRO} STREQUAL "ubuntu")
   if(${LINUX_DISTRO_VERSION} VERSION_GREATER_EQUAL "18")
     assert_package_detected(
-      detect FALSE
+      detect TRUE
       legacyvariable HAVE_LIBXML
       variablename LibXml2_FOUND)
   endif()
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list