Changeset: c4b56aecb592 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c4b56aecb592
Branch: txtsim-imp
Log Message:
Merge with Jun2023.
diffs (24 lines):
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -52,6 +52,9 @@ endif(HAVE_GEOM)
if (HAVE_HGE)
set(HAVE_HGE_FALSE "#")
endif(HAVE_HGE)
+if (HAVE_ICONV)
+ set(HAVE_ICONV_FALSE "#")
+endif(HAVE_ICONV)
if (HAVE_LIBBZ2)
set(HAVE_LIBBZ2_FALSE "#")
endif(HAVE_LIBBZ2)
diff --git a/testing/Mtest.py.in b/testing/Mtest.py.in
--- a/testing/Mtest.py.in
+++ b/testing/Mtest.py.in
@@ -367,6 +367,7 @@ CONDITIONALS = {
'HAVE_FITS' : "@HAVE_FITS_FALSE@",
'HAVE_GEOM' : "@HAVE_GEOM_FALSE@",
'HAVE_HGE' : "@HAVE_HGE_FALSE@",
+ 'HAVE_ICONV' : "@HAVE_ICONV_FALSE@",
'HAVE_LIBBZ2' : "@HAVE_LIBBZ2_FALSE@",
'HAVE_LIBLZ4' : "@HAVE_LIBLZ4_FALSE@",
'HAVE_LIBLZMA' : "@HAVE_LIBLZMA_FALSE@",
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
