Changeset: 9534661eaf9e for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9534661eaf9e Added Files: ctest/cmake/test_detect_bz2.c.in ctest/cmake/test_detect_commoncrypto.c.in ctest/cmake/test_detect_gdal.c.in ctest/cmake/test_detect_geos.c.in ctest/cmake/test_detect_iconv.c.in ctest/cmake/test_detect_libpy3.c.in ctest/cmake/test_detect_libr.c.in ctest/cmake/test_detect_libz.c.in ctest/cmake/test_detect_lz4.c.in ctest/cmake/test_detect_lzma.c.in ctest/cmake/test_detect_netcdf.c.in ctest/cmake/test_detect_openssl.c.in ctest/cmake/test_detect_pcre.c.in ctest/cmake/test_detect_proj.c.in ctest/cmake/test_detect_readline.c.in ctest/cmake/test_detect_snappy.c.in ctest/cmake/test_detect_uuid.c.in ctest/cmake/test_detect_valgrind.c.in ctest/cmake/test_detect_xml.c.in documentation/old/README.rst Modified Files: clients/Tests/MAL-signatures.stable.out clients/Tests/MAL-signatures.stable.out.int128 gdk/gdk_cand.c monetdb5/modules/atoms/batxml.c monetdb5/modules/kernel/algebra.c monetdb5/modules/kernel/bat5.c monetdb5/modules/mal/batcalc.c monetdb5/modules/mal/calc.c monetdb5/modules/mal/pcre.c sql/backends/monet5/rel_bin.c sql/backends/monet5/sql_statement.c sql/server/rel_optimizer.c Branch: default Log Message:
Merge with oscar branch. diffs (truncated from 592 to 300 lines): diff --git a/ctest/cmake/test_detect_bz2.c.in b/ctest/cmake/test_detect_bz2.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_bz2.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_LIBBZ2 + return 0; +#else + return 1; +#endif +} diff --git a/ctest/cmake/test_detect_commoncrypto.c.in b/ctest/cmake/test_detect_commoncrypto.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_commoncrypto.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_COMMONCRYPTO + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_gdal.c.in b/ctest/cmake/test_detect_gdal.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_gdal.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_SHP + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_geos.c.in b/ctest/cmake/test_detect_geos.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_geos.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_GEOM + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_iconv.c.in b/ctest/cmake/test_detect_iconv.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_iconv.c.in @@ -0,0 +1,20 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_ICONV + return @DETECT@; +#else + return @UNDETECT@; + +#endif +} diff --git a/ctest/cmake/test_detect_libpy3.c.in b/ctest/cmake/test_detect_libpy3.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_libpy3.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_LIBPY3 + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_libr.c.in b/ctest/cmake/test_detect_libr.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_libr.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_LIBR + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_libz.c.in b/ctest/cmake/test_detect_libz.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_libz.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_LIBZ + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_lz4.c.in b/ctest/cmake/test_detect_lz4.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_lz4.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_LIBLZ4 + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_lzma.c.in b/ctest/cmake/test_detect_lzma.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_lzma.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_LIBLZMA + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_netcdf.c.in b/ctest/cmake/test_detect_netcdf.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_netcdf.c.in @@ -0,0 +1,19 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_NETCDF + return @DETECT@; +#else + return @UNDETECT@; +#endif +} diff --git a/ctest/cmake/test_detect_openssl.c.in b/ctest/cmake/test_detect_openssl.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_openssl.c.in @@ -0,0 +1,20 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * Copyright 1997 - July 2008 CWI, August 2008 - 2020 MonetDB B.V. + */ + +#include "monetdb_config.h" + +int +main(void) +{ +#ifdef HAVE_OPENSSL + return @DETECT@; +#else + return @UNDETECT@; + +#endif +} diff --git a/ctest/cmake/test_detect_pcre.c.in b/ctest/cmake/test_detect_pcre.c.in new file mode 100644 --- /dev/null +++ b/ctest/cmake/test_detect_pcre.c.in @@ -0,0 +1,20 @@ +/* + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
