Changeset: 03669e73a54b for MonetDB URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=03669e73a54b Modified Files: cmake/monetdb-defines.cmake monetdb_config.h.in monetdb_config_win32.h.in Branch: mbedded Log Message:
reorganize code, match order of detection and definition diffs (truncated from 437 to 300 lines): diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake --- a/cmake/monetdb-defines.cmake +++ b/cmake/monetdb-defines.cmake @@ -11,6 +11,7 @@ # additional variables, for example for legacy defines, do this # in the "monetdb_macro_variables" macro. function(monetdb_configure_defines) + find_path(HAVE_SYS_TYPES_H "sys/types.h") find_path(HAVE_DISPATCH_DISPATCH_H "dispatch/dispatch.h") find_path(HAVE_DLFCN_H "dlfcn.h") find_path(HAVE_FCNTL_H "fcntl.h") @@ -31,7 +32,7 @@ function(monetdb_configure_defines) find_path(HAVE_STROPTS_H "stropts.h") find_path(HAVE_SYS_FILE_H "sys/file.h") find_path(HAVE_SYS_IOCTL_H "sys/ioctl.h") - find_path(HAVE_SYS_IOCTL_H "sys/sysctl.h") + find_path(HAVE_SYS_SYSCTL_H "sys/sysctl.h") find_path(HAVE_SYS_MMAN_H "sys/mman.h") find_path(HAVE_SYS_PARAM_H "sys/param.h") find_path(HAVE_SYS_RESOURCE_H "sys/resource.h") @@ -44,7 +45,6 @@ function(monetdb_configure_defines) find_path(HAVE_UNISTD_H "unistd.h") find_path(HAVE_UUID_UUID_H "uuid/uuid.h") find_path(HAVE_WINSOCK_H "winsock2.h") - find_path(HAVE_SYS_TYPES_H "sys/types.h") find_path(HAVE_SEMAPHORE_H "semaphore.h") find_path(HAVE_GETOPT_H "getopt.h") diff --git a/monetdb_config.h.in b/monetdb_config.h.in --- a/monetdb_config.h.in +++ b/monetdb_config.h.in @@ -26,7 +26,7 @@ #include <stdbool.h> #include <assert.h> -#cmakedefine HAVE_DIRENT_H @HAVE_DIRENT_H@ +// Section: monetdb configure defines #cmakedefine HAVE_DISPATCH_DISPATCH_H @HAVE_DISPATCH_DISPATCH_H@ #cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ #cmakedefine HAVE_FCNTL_H @HAVE_FCNTL_H@ @@ -52,9 +52,7 @@ #cmakedefine HAVE_SYS_MMAN_H @HAVE_SYS_MMAN_H@ #cmakedefine HAVE_SYS_PARAM_H @HAVE_SYS_PARAM_H@ #cmakedefine HAVE_SYS_RESOURCE_H @HAVE_SYS_RESOURCE_H@ -#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@ #cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@ -#cmakedefine HAVE_GETTIMEOFDAY @HAVE_SYS_TIME_H@ #cmakedefine HAVE_SYS_TIMES_H @HAVE_SYS_TIMES_H@ #cmakedefine HAVE_SYS_UIO_H @HAVE_SYS_UIO_H@ #cmakedefine HAVE_SYS_UN_H @HAVE_SYS_UN_H@ @@ -64,49 +62,18 @@ #cmakedefine HAVE_UNISTD_H 1 #cmakedefine HAVE_UUID_UUID_H @HAVE_UUID_UUID_H@ #cmakedefine HAVE_WINSOCK_H @HAVE_WINSOCK_H@ - #cmakedefine HAVE_SEMAPHORE_H @HAVE_SEMAPHORE_H@ - -#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ -#cmakedefine HAVE_GETADDRINFO @HAVE_GETADDRINFO@ +#cmakedefine HAVE_GETOPT_H @HAVE_GETOPT_H@ -#define ICONV_CONST -#cmakedefine HAVE_PTHREAD_KILL @HAVE_PTHREAD_KILL@ -#cmakedefine HAVE_PTHREAD_SIGMASK @HAVE_PTHREAD_SIGMASK@ -#cmakedefine HAVE_LOCALTIME_R @HAVE_LOCALTIME_R@ -#cmakedefine HAVE_STRERROR_R @HAVE_STRERROR_R@ - -// Section: monetdb configure defines #cmakedefine HAVE_STDATOMIC_H @HAVE_STDATOMIC_H@ -#cmakedefine HAVE_GETOPT_H @HAVE_GETOPT_H@ -#cmakedefine HAVE_GETOPT @HAVE_GETOPT@ -// End Section: monetdb configure defines -// Section: monetdb macro variables -#cmakedefine HAVE_ICONV @HAVE_ICONV@ -#cmakedefine HAVE_PTHREAD_H @HAVE_PTHREAD_H@ -#cmakedefine HAVE_LIBPCRE @HAVE_LIBPCRE@ -#cmakedefine HAVE_OPENSSL @HAVE_OPENSSL@ -#cmakedefine HAVE_COMMONCRYPTO @HAVE_COMMONCRYPTO@ -#cmakedefine HAVE_LIBBZ2 @HAVE_LIBBZ2@ -#cmakedefine HAVE_CURL @HAVE_CURL@ -#cmakedefine HAVE_LIBLZMA @HAVE_LIBLZMA@ -#cmakedefine HAVE_LIBXML @HAVE_LIBXML@ -#cmakedefine HAVE_LIBZ @HAVE_LIBZ@ -#cmakedefine HAVE_LIBLZ4 @HAVE_LIBLZ4@ -#cmakedefine HAVE_PROJ @HAVE_PROJ@ -#cmakedefine HAVE_SNAPPY @HAVE_SNAPPY@ -#cmakedefine HAVE_UUID @HAVE_UUID@ -#cmakedefine HAVE_VALGRIND @HAVE_VALGRIND@ -#cmakedefine HAVE_NETCDF @HAVE_NETCDF@ -#cmakedefine HAVE_READLINE @HAVE_READLINE@ -// End Section: monetdb macro variables - -#define FLEXIBLE_ARRAY_MEMBER - +#cmakedefine HAVE_DIRENT_H @HAVE_DIRENT_H@ +#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@ +#cmakedefine HAVE_GETTIMEOFDAY @HAVE_SYS_TIME_H@ +#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ +#cmakedefine HAVE_FDATASYNC @HAVE_FDATASYNC@ #cmakedefine HAVE_ACCEPT4 @HAVE_ACCEPT4@ #cmakedefine HAVE_ASCTIME_R @HAVE_ASCTIME_R@ -#define HAVE_CBRT 1 #cmakedefine HAVE_CLOCK_GETTIME @HAVE_CLOCK_GETTIME@ #cmakedefine HAVE_CTIME_R @HAVE_CTIME_R@ #cmakedefine HAVE_DISPATCH_SEMAPHORE_CREATE @HAVE_DISPATCH_SEMAPHORE_CREATE@ @@ -123,6 +90,7 @@ #cmakedefine HAVE_GETUID @HAVE_GETUID@ #cmakedefine HAVE_GMTIME_R @HAVE_GMTIME_R@ #cmakedefine HAVE_LOCALTIME_R @HAVE_LOCALTIME_R@ +#cmakedefine HAVE_STRERROR_R @HAVE_STRERROR_R@ #cmakedefine HAVE_LOCKF @HAVE_LOCKF@ #cmakedefine HAVE_MADVISE @HAVE_MADVISE@ #cmakedefine HAVE_MREMAP @HAVE_MREMAP@ @@ -148,10 +116,36 @@ #cmakedefine HAVE_TASK_INFO @HAVE_TASK_INFO@ #cmakedefine HAVE_TIMES @HAVE_TIMES@ #cmakedefine HAVE_UNAME @HAVE_UNAME@ +// #cmakedefine HAVE_SEMTIMEDOP +#cmakedefine HAVE_PTHREAD_KILL @HAVE_PTHREAD_KILL@ +#cmakedefine HAVE_PTHREAD_SIGMASK @HAVE_PTHREAD_SIGMASK@ +#cmakedefine HAVE_GETOPT @HAVE_GETOPT@ -#cmakedefine HAVE_FDATASYNC @HAVE_FDATASYNC@ +#define ICONV_CONST +#define FLEXIBLE_ARRAY_MEMBER +#define HAVE_CBRT 1 #define ENABLE_MAPI 1 #define HAVE_MAPI 1 +// End Section: monetdb configure defines + +// Section: monetdb macro variables +#cmakedefine HAVE_ICONV @HAVE_ICONV@ +#cmakedefine HAVE_PTHREAD_H @HAVE_PTHREAD_H@ +#cmakedefine HAVE_LIBPCRE @HAVE_LIBPCRE@ +#cmakedefine HAVE_OPENSSL @HAVE_OPENSSL@ +#cmakedefine HAVE_COMMONCRYPTO @HAVE_COMMONCRYPTO@ +#cmakedefine HAVE_LIBBZ2 @HAVE_LIBBZ2@ +#cmakedefine HAVE_CURL @HAVE_CURL@ +#cmakedefine HAVE_LIBLZMA @HAVE_LIBLZMA@ +#cmakedefine HAVE_LIBXML @HAVE_LIBXML@ +#cmakedefine HAVE_LIBZ @HAVE_LIBZ@ +#cmakedefine HAVE_LIBLZ4 @HAVE_LIBLZ4@ +#cmakedefine HAVE_PROJ @HAVE_PROJ@ +#cmakedefine HAVE_SNAPPY @HAVE_SNAPPY@ +#cmakedefine HAVE_UUID @HAVE_UUID@ +#cmakedefine HAVE_VALGRIND @HAVE_VALGRIND@ +#cmakedefine HAVE_NETCDF @HAVE_NETCDF@ +#cmakedefine HAVE_READLINE @HAVE_READLINE@ #cmakedefine HAVE_GEOM @GEOS_FOUND@ #cmakedefine HAVE_LIBPY3 @HAVE_LIBPY3@ @@ -159,16 +153,46 @@ #cmakedefine HAVE_FITS @CFITSIO_FOUND@ #cmakedefine HAVE_SHP @GDAL_FOUND@ #cmakedefine HAVE_CUDF @HAVE_CUDF@ +#cmakedefine RHOME "@RHOME@" -/* Directory separator */ +// #cmakedefine SOCKET_LIBRARIES +#cmakedefine HAVE_GETADDRINFO @HAVE_GETADDRINFO@ + #cmakedefine DIR_SEP '@DIR_SEP@' +#cmakedefine PATH_SEP '@PATH_SEP@' #cmakedefine DIR_SEP_STR "@DIR_SEP_STR@" -#cmakedefine PATH_SEP '@PATH_SEP@' +#cmakedefine SO_PREFIX "@SO_PREFIX@" +#cmakedefine SO_EXT "@SO_EXT@" + +#cmakedefine BINDIR "@BINDIR@" +#cmakedefine LIBDIR "@LIBDIR@" +#cmakedefine DATADIR "@DATADIR@" +#cmakedefine DATA_DIR "@DATA_DIR@" +#cmakedefine LOCALSTATEDIR "@LOCALSTATEDIR@" +// #cmakedefine QXLOCALSTATEDIR +// #cmakedefine MONETDB_PREFIX +#cmakedefine DATAROOTDIR "@DATAROOTDIR@" +#cmakedefine BIN_DIR "@BIN_DIR@" +#cmakedefine INCLUDEDIR "@INCLUDEDIR@" +#cmakedefine INFODIR "@INFODIR@" +#cmakedefine LIB_DIR "@LIB_DIR@" +#cmakedefine LIBEXECDIR "@LIBEXECDIR@" +#cmakedefine LOCALSTATE_DIR "@LOCALSTATE_DIR@" +//#cmakedefine MANDIR "@MANDIR@" +#cmakedefine SYSCONFDIR "@SYSCONFDIR@" +#cmakedefine LOGDIR "@LOGDIR@" +#cmakedefine PKGCONFIGDIR "@PKGCONFIGDIR@" +#cmakedefine RUNDIR "@RUNDIR@" + +// End Section: monetdb macro variables #define VERSION "@MONETDB_VERSION@" #define PACKAGE_VERSION "@MONETDB_VERSION@" #define PACKAGE_NAME "MonetDB" +/* Host identifier */ +#cmakedefine HOST "@HOST@" + /* The used password hash algorithm */ #define MONETDB5_PASSWDHASH "@PASSWORD_BACKEND@" @@ -183,29 +207,6 @@ #cmakedefine HAVE_SHA384_UPDATE @HAVE_SHA384_UPDATE@ #cmakedefine HAVE_SHA512_UPDATE @HAVE_SHA512_UPDATE@ -#cmakedefine BINDIR "@BINDIR@" -#cmakedefine LIBDIR "@LIBDIR@" -/* read-only architecture-independent data */ -#cmakedefine DATA_DIR "@DATADIR@" -#cmakedefine LOCALSTATEDIR "@LOCALSTATEDIR@" - -#cmakedefine DATADIR "@DATADIR@" -#cmakedefine DATAROOTDIR "@DATAROOTDIR@" -#cmakedefine BIN_DIR "@BIN_DIR@" -#cmakedefine INCLUDEDIR "@INCLUDEDIR@" -#cmakedefine INFODIR "@INFODIR@" -#cmakedefine LIB_DIR "@LIB_DIR@" -#cmakedefine LIBEXECDIR "@LIBEXECDIR@" -#cmakedefine LOCALSTATE_DIR "@LOCALSTATE_DIR@" -#cmakedefine MANDIR "@MANDIR@" -#cmakedefine SYSCONFDIR "@SYSCONFDIR@" -#cmakedefine LOGDIR "@LOGDIR@" -#cmakedefine PKGCONFIGDIR "@PKGCONFIGDIR@" -#cmakedefine RUNDIR "@RUNDIR@" - -/* Host identifier */ -#cmakedefine HOST "@HOST@" - #cmakedefine SIZEOF_SIZE_T @SIZEOF_SIZE_T@ /* The size of `void *', as computed by sizeof. */ @@ -220,13 +221,6 @@ #cmakedefine LENP_OR_POINTER_T @LENP_OR_POINTER_T@ #cmakedefine SIZEOF_SQLWCHAR @SIZEOF_SQLWCHAR@ -#cmakedefine RHOME "@RHOME@" - -/* Shared Object extension */ -#cmakedefine SO_EXT "@SO_EXT@" - -/* Shared Object prefix */ -#cmakedefine SO_PREFIX "@SO_PREFIX@" #ifndef _Noreturn #cmakedefine _Noreturn @_Noreturn@ diff --git a/monetdb_config_win32.h.in b/monetdb_config_win32.h.in --- a/monetdb_config_win32.h.in +++ b/monetdb_config_win32.h.in @@ -123,37 +123,48 @@ stpcpy(char *restrict dst, const char *r #endif /* _MSC_VER */ -#cmakedefine HAVE_SYS_MMAN_H @HAVE_SYS_MMAN_H@ -#cmakedefine HAVE_MADVISE @HAVE_MADVISE@ -#cmakedefine HAVE_POSIX_MADVISE @HAVE_POSIX_MADVISE@ - -#cmakedefine HAVE_LOCKF @HAVE_LOCKF@ -#cmakedefine HAVE_DIRENT_H @HAVE_DIRENT_H@ -#define FLEXIBLE_ARRAY_MEMBER -#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@ -#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ -#cmakedefine HAVE_NETDB_H @HAVE_NETDB_H@ -#cmakedefine HAVE_GETADDRINFO @HAVE_GETADDRINFO@ -#cmakedefine HAVE_SYSCONF @HAVE_SYSCONF@ -#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ -#cmakedefine HAVE_STRNCASECMP @HAVE_STRNCASECMP@ +// Section: monetdb configure defines +#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ #cmakedefine HAVE_FCNTL_H @HAVE_FCNTL_H@ #cmakedefine HAVE_ICONV_H @HAVE_ICONV_H@ -#define ICONV_CONST -#cmakedefine HAVE_DLFCN_H @HAVE_DLFCN_H@ +#cmakedefine HAVE_STRINGS_H @HAVE_STRINGS_H@ +#cmakedefine HAVE_SYS_MMAN_H @HAVE_SYS_MMAN_H@ #cmakedefine HAVE_SYS_UN_H @HAVE_SYS_UN_H@ #cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@ +#cmakedefine HAVE_UUID_UUID_H @HAVE_UUID_UUID_H@ +#cmakedefine HAVE_WINSOCK_H @HAVE_WINSOCK_H@ +#cmakedefine HAVE_SEMAPHORE_H @HAVE_SEMAPHORE_H@ +#cmakedefine HAVE_GETOPT_H @HAVE_GETOPT_H@ + +#cmakedefine HAVE_DIRENT_H @HAVE_DIRENT_H@ +#cmakedefine HAVE_NETDB_H @HAVE_NETDB_H@ +#cmakedefine HAVE_SYS_SOCKET_H @HAVE_SYS_SOCKET_H@ #cmakedefine HAVE_SYS_TIME_H @HAVE_SYS_TIME_H@ -#cmakedefine HAVE_GETTIMEOFDAY @HAVE_SYS_TIME_H@ -#cmakedefine HAVE_FTIME @HAVE_FTIME@ -#cmakedefine HAVE_POPEN @HAVE_POPEN@ -#cmakedefine HAVE_WINSOCK_H @HAVE_WINSOCK_H@ +#cmakedefine HAVE_SYS_STAT_H @HAVE_SYS_STAT_H@ +#cmakedefine HAVE_FDATASYNC @HAVE_FDATASYNC@ //#cmakedefine HAVE_CTIME_R @HAVE_CTIME_R@ -#cmakedefine GETOPT_LIB @GETOPT_LIB@ +#cmakedefine HAVE_FSYNC @HAVE_FSYNC@ +#cmakedefine HAVE_FTIME @HAVE_FTIME@ +#cmakedefine HAVE_GETTIMEOFDAY @HAVE_SYS_TIME_H@ +#cmakedefine HAVE_LOCKF @HAVE_LOCKF@ #cmakedefine HAVE_STRERROR_R @HAVE_STRERROR_R@ +#cmakedefine HAVE_MADVISE @HAVE_MADVISE@ +#cmakedefine HAVE_POPEN @HAVE_POPEN@ _______________________________________________ checkin-list mailing list checkin-list@monetdb.org https://www.monetdb.org/mailman/listinfo/checkin-list
