Changeset: 8fc24a86548e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8fc24a86548e
Added Files:
sql/backends/monet5/UDF/pyapi/CMakeLists.txt
sql/backends/monet5/UDF/pyapi3/CMakeLists.txt
Modified Files:
CMakeLists.txt
monetdb_config.h.in
sql/backends/monet5/UDF/CMakeLists.txt
sql/backends/monet5/UDF/capi/CMakeLists.txt
sql/backends/monet5/vaults/bam/CMakeLists.txt
sql/backends/monet5/vaults/fits/CMakeLists.txt
sql/backends/monet5/vaults/lidar/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/backends/monet5/vaults/shp/CMakeLists.txt
Branch: cmake-fun
Log Message:
Compiles and installs data python 2 and 3 udf modules.
diffs (truncated from 975 to 300 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -660,8 +660,8 @@ if(NOT ${PYTHON2} STREQUAL "NO")
if(HAVE_PYTHON2)
string(LENGTH "${PY2_OUPUT_RES}" PY2_OUPUT_LENGTH)
- string(SUBSTRING "${PY2_OUPUT_RES}" 9 ${PY2_OUPUT_LENGTH}
PY2_VERSION)
- if(PY2_VERSION LESS 6)
+ string(SUBSTRING "${PY2_OUPUT_RES}" 7 ${PY2_OUPUT_LENGTH}
PY2_VERSION) # Remove "Python "
+ if(PY2_VERSION LESS 2.6)
set(HAVE_PYTHON2 NO)
if(${PYTHON2} STREQUAL "YES")
message(FATAL_ERROR "Python 2 executable is too
old (<2.6)")
@@ -741,8 +741,8 @@ if(NOT ${PYTHON3} STREQUAL "NO")
if(HAVE_PYTHON3)
string(LENGTH "${PY3_OUPUT_RES}" PY3_OUPUT_LENGTH)
- string(SUBSTRING "${PY3_OUPUT_RES}" 9 PY3_OUPUT_LENGTH
PY3_VERSION)
- if(PY3_VERSION LESS 5)
+ string(SUBSTRING "${PY3_OUPUT_RES}" 7 PY3_OUPUT_LENGTH
PY3_VERSION) # Remove "Python "
+ if(PY3_VERSION LESS 3.5)
set(HAVE_PYTHON3 NO)
if(${PYTHON3} STREQUAL "YES")
message(FATAL_ERROR "Python 3 executable is too
old (<3.5)")
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -8,8 +8,8 @@
#cmakedefine NDEBUG
#endif
-/* Define if you have the <sys/types.h> header file. */
-#cmakedefine HAVE_SYS_TYPES_H
+/* Define to 1 if you have the <sys/types.h> header file. */
+#cmakedefine HAVE_SYS_TYPES_H 1
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
@@ -75,7 +75,9 @@
#cmakedefine MERCURIAL_ID "@MERCURIAL_ID@"
/* Define if building universal (internal helper macro) */
+#ifndef AC_APPLE_UNIVERSAL_BUILD
#cmakedefine AC_APPLE_UNIVERSAL_BUILD
+#endif
/* location where binaries are installed */
#cmakedefine BINDIR "@BIN_DIR@"
@@ -99,458 +101,456 @@
(struct s)' as it overestimates the size. Use 'offsetof (struct s, d)'
instead. Don't use 'offsetof (struct s, d[0])', as this doesn't work with
MSVC and with C++ compilers. */
+#ifndef FLEXIBLE_ARRAY_MEMBER
#cmakedefine FLEXIBLE_ARRAY_MEMBER
+#endif
-/* Define if you have the `accept4' function. */
-#cmakedefine HAVE_ACCEPT4
-
-/* Define if you have the `asctime_r' function. */
-#cmakedefine HAVE_ASCTIME_R
+/* Define to 1 if you have the `accept4' function. */
+#cmakedefine HAVE_ACCEPT4 1
-/* Define if you have asctime_r(struct tm*,char *buf,size_t s) */
-#cmakedefine HAVE_ASCTIME_R3
+/* Define to 1 if you have the `asctime_r' function. */
+#cmakedefine HAVE_ASCTIME_R 1
-/* Define if you have asctime_s(char *buf,size_t s, struct tm*) */
-#cmakedefine HAVE_ASCTIME_S3
+/* Define to 1 if you have asctime_r(struct tm*,char *buf,size_t s) */
+#cmakedefine HAVE_ASCTIME_R3 1
-/* Define if you have the `backtrace' function. */
-#cmakedefine HAVE_BACKTRACE
+/* Define to 1 if you have asctime_s(char *buf,size_t s, struct tm*) */
+#cmakedefine HAVE_ASCTIME_S3 1
-/* Define if you have the <bam/bam.h> header file. */
-#cmakedefine HAVE_BAM_BAM_H
+/* Define to 1 if you have the `backtrace' function. */
+#cmakedefine HAVE_BACKTRACE 1
-/* Define if you have the <bam/bgzf.h> header file. */
-#cmakedefine HAVE_BAM_BGZF_H
+/* Define to 1 if you have the <bam/bam.h> header file. */
+#cmakedefine HAVE_BAM_BAM_H 1
-/* Define if you have the <bam/kstring.h> header file. */
-#cmakedefine HAVE_BAM_KSTRING_H
+/* Define to 1 if you have the <bam/bgzf.h> header file. */
+#cmakedefine HAVE_BAM_BGZF_H 1
-/* Define if you have the <bam/sam.h> header file. */
-#cmakedefine HAVE_BAM_SAM_H
+/* Define to 1 if you have the <bam/kstring.h> header file. */
+#cmakedefine HAVE_BAM_KSTRING_H 1
+
+/* Define to 1 if you have the <bam/sam.h> header file. */
+#cmakedefine HAVE_BAM_SAM_H 1
-/* Define if you have the `clock_gettime' function. */
-#cmakedefine HAVE_CLOCK_GETTIME
+/* Define to 1 if you have the `clock_gettime' function. */
+#cmakedefine HAVE_CLOCK_GETTIME 1
-/* Define if you have the CommonCrypto library */
-#cmakedefine HAVE_COMMONCRYPTO
+/* Define to 1 if you have the CommonCrypto library */
+#cmakedefine HAVE_COMMONCRYPTO 1
/* If the console should be used */
-#cmakedefine HAVE_CONSOLE
+#cmakedefine HAVE_CONSOLE 1
-/* Define if you have the `ctime_r' function. */
-#cmakedefine HAVE_CTIME_R
+/* Define to 1 if you have the `ctime_r' function. */
+#cmakedefine HAVE_CTIME_R 1
-/* Define if you have ctime_r(time_t*,char *buf,size_t s) */
-#cmakedefine HAVE_CTIME_R3
+/* Define to 1 if you have ctime_r(time_t*,char *buf,size_t s) */
+#cmakedefine HAVE_CTIME_R3 1
-/* Define if you have ctime_s(time_t*,char *buf,size_t s) */
-#cmakedefine HAVE_CTIME_S3
+/* Define to 1 if you have ctime_s(time_t*,char *buf,size_t s) */
+#cmakedefine HAVE_CTIME_S3 1
-/* Define if you have the cURL library */
-#cmakedefine HAVE_CURL
+/* Define to 1 if you have the cURL library */
+#cmakedefine HAVE_CURL 1
-/* Define if you have the <dirent.h> header file. */
-#cmakedefine HAVE_DIRENT_H
+/* Define to 1 if you have the <dirent.h> header file. */
+#cmakedefine HAVE_DIRENT_H 1
-/* Define if you have the <dispatch/dispatch.h> header file. */
-#cmakedefine HAVE_DISPATCH_DISPATCH_H
+/* Define to 1 if you have the <dispatch/dispatch.h> header file. */
+#cmakedefine HAVE_DISPATCH_DISPATCH_H 1
-/* Define if you have the `dispatch_semaphore_create' function. */
-#cmakedefine HAVE_DISPATCH_SEMAPHORE_CREATE
+/* Define to 1 if you have the `dispatch_semaphore_create' function. */
+#cmakedefine HAVE_DISPATCH_SEMAPHORE_CREATE 1
-/* Define if you have the <dlfcn.h> header file. */
-#cmakedefine HAVE_DLFCN_H
+/* Define to 1 if you have the <dlfcn.h> header file. */
+#cmakedefine HAVE_DLFCN_H 1
/* Support for MonetDB as a library */
-#cmakedefine HAVE_EMBEDDED
+#cmakedefine HAVE_EMBEDDED 1
-/* Support for MonetDB as a library for R */
-#undef HAVE_EMBEDDED_R
+/* Define to 1 if you have the <execinfo.h> header file. */
+#cmakedefine HAVE_EXECINFO_H 1
-/* Define if you have the <execinfo.h> header file. */
-#cmakedefine HAVE_EXECINFO_H
+/* Define to 1 if you have the `fallocate' function. */
+#cmakedefine HAVE_FALLOCATE 1
-/* Define if you have the `fallocate' function. */
-#cmakedefine HAVE_FALLOCATE
+/* Define to 1 if you have the `fcntl' function. */
+#cmakedefine HAVE_FCNTL 1
-/* Define if you have the `fcntl' function. */
-#cmakedefine HAVE_FCNTL
+/* Define to 1 if you have the <fcntl.h> header file. */
+#cmakedefine HAVE_FCNTL_H 1
-/* Define if you have the <fcntl.h> header file. */
-#cmakedefine HAVE_FCNTL_H
+/* Define to 1 if the system has a working fdatasync */
+#cmakedefine HAVE_FDATASYNC 1
-/* If the system has a working fdatasync */
-#cmakedefine HAVE_FDATASYNC
+/* Define to 1 if the fits module is to be enabled */
+#cmakedefine HAVE_FITS 1
-/* Define if the fits module is to be enabled */
-#cmakedefine HAVE_FITS
+/* Define to 1 if fork exists */
+#cmakedefine HAVE_FORK 1
-/* Define if fork exists */
-#cmakedefine HAVE_FORK
+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
+#cmakedefine HAVE_FSEEKO 1
-/* Define if fseeko (and presumably ftello) exists and is declared. */
-#cmakedefine HAVE_FSEEKO
+/* Define to 1 if you have the `fsync' function. */
+#cmakedefine HAVE_FSYNC 1
-/* Define if you have the `fsync' function. */
-#cmakedefine HAVE_FSYNC
+/* Define to 1 if you have the `ftime' function. */
+#cmakedefine HAVE_FTIME 1
-/* Define if you have the `ftime' function. */
-#cmakedefine HAVE_FTIME
+/* Define to 1 if you have the `getaddrinfo' function. */
+#cmakedefine HAVE_GETADDRINFO 1
-/* Define if you have the `getaddrinfo' function. */
-#cmakedefine HAVE_GETADDRINFO
+/* Define to 1 if you have the `GetDynamicTimeZoneInformation' function. */
+#cmakedefine HAVE_GETDYNAMICTIMEZONEINFORMATION 1
-/* Define if you have the `GetDynamicTimeZoneInformation' function. */
-#cmakedefine HAVE_GETDYNAMICTIMEZONEINFORMATION
+/* Define to 1 if you have the `getexecname' function. */
+#cmakedefine HAVE_GETEXECNAME 1
-/* Define if you have the `getexecname' function. */
-#cmakedefine HAVE_GETEXECNAME
+/* Define to 1 if you have the `getlogin' function. */
+#cmakedefine HAVE_GETLOGIN 1
-/* Define if you have the `getlogin' function. */
-#cmakedefine HAVE_GETLOGIN
+/* Define to 1 if you have the `getopt' function. */
+#cmakedefine HAVE_GETOPT 1
-/* Define if you have the `getopt' function. */
-#cmakedefine HAVE_GETOPT
+/* Define to 1 if you have the <getopt.h> header file. */
+#cmakedefine HAVE_GETOPT_H 1
-/* Define if you have the <getopt.h> header file. */
-#cmakedefine HAVE_GETOPT_H
+/* Define to 1 if you have the `getopt_long' function. */
+#cmakedefine HAVE_GETOPT_LONG 1
-/* Define if you have the `getopt_long' function. */
-#cmakedefine HAVE_GETOPT_LONG
+/* Define to 1 if you have the `gettimeofday' function. */
+#cmakedefine HAVE_GETTIMEOFDAY 1
-/* Define if you have the `gettimeofday' function. */
-#cmakedefine HAVE_GETTIMEOFDAY
+/* Define to 1 if you have the `getuid' function. */
+#cmakedefine HAVE_GETUID 1
-/* Define if you have the `getuid' function. */
-#cmakedefine HAVE_GETUID
+/* Define to 1 if you have the iconv() function and it works. */
+#cmakedefine HAVE_ICONV 1
-/* Define if you have the iconv() function and it works. */
-#cmakedefine HAVE_ICONV
+/* Define to 1 if you have the <iconv.h> header file. */
+#cmakedefine HAVE_ICONV_H 1
-/* Define if you have the <iconv.h> header file. */
-#cmakedefine HAVE_ICONV_H
+/* Define to 1 if you have the <io.h> header file. */
+#cmakedefine HAVE_IO_H 1
-/* Define if you have the <io.h> header file. */
-#cmakedefine HAVE_IO_H
+/* Define to 1 if you have the <langinfo.h> header file. */
+#cmakedefine HAVE_LANGINFO_H 1
-/* Define if you have the <langinfo.h> header file. */
-#cmakedefine HAVE_LANGINFO_H
-
-/* Define if you have the bz2 library */
-#cmakedefine HAVE_LIBBZ2
+/* Define to 1 if you have the bz2 library */
+#cmakedefine HAVE_LIBBZ2 1
-/* Define if you have the <libgen.h> header file. */
-#cmakedefine HAVE_LIBGEN_H
+/* Define to 1 if you have the <libgen.h> header file. */
+#cmakedefine HAVE_LIBGEN_H 1
-/* Define if you have the <libintl.h> header file. */
-#cmakedefine HAVE_LIBINTL_H
+/* Define to 1 if you have the <libintl.h> header file. */
+#cmakedefine HAVE_LIBINTL_H 1
-/* Define if you have the lz4 library */
-#cmakedefine HAVE_LIBLZ4
+/* Define to 1 if you have the lz4 library */
+#cmakedefine HAVE_LIBLZ4 1
-/* Define if you have the lzma library */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
