Changeset: 92827f2cdc43 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=92827f2cdc43
Modified Files:
CMakeLists.txt
common/stream/CMakeLists.txt
gdk/gdk_hash.c
gdk/gdk_orderidx.c
gdk/gdk_posix.h
gdk/gdk_storage.c
gdk/gdk_utils.c
geom/lib/CMakeLists.txt
monetdb_config.h.in
sql/common/CMakeLists.txt
sql/server/CMakeLists.txt
sql/storage/CMakeLists.txt
sql/storage/bat/CMakeLists.txt
Branch: cmake-fun
Log Message:
More compilation fixes.
diffs (175 lines):
diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -237,7 +237,7 @@ set(FLEXIBLE_ARRAY_MEMBER ON) # We compi
if(MSVC)
set(__attribute__(a) ON)
set(restrict __restrict)
- add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+ add_compile_definitions(_CRT_SECURE_NO_WARNINGS
_CRT_SECURE_NO_DEPRECATE _WINSOCK_DEPRECATED_NO_WARNINGS)
endif()
#
https://github.com/Unidata/netcdf-c/commit/b432a527c4a38af45498691a44c5a88961b9c751
diff --git a/common/stream/CMakeLists.txt b/common/stream/CMakeLists.txt
--- a/common/stream/CMakeLists.txt
+++ b/common/stream/CMakeLists.txt
@@ -11,7 +11,7 @@ include_directories(${ZLIB_INCLUDE_DIR}
add_library(stream SHARED stream.c stream.h stream_socket.h)
target_link_libraries(stream PRIVATE ${ZLIB_LIBRARIES} ${BZIP2_LIBRARIES}
${SNAPPY_LIBRARIES} ${LZ4_LIBRARIES}
- ${LIBLZMA_LIBRARIES}
${CURL_LIBRARIES} ${ICONV_LIBRARIES})
+ ${LIBLZMA_LIBRARIES}
${CURL_LIBRARIES} ${ICONV_LIBRARIES} ${SOCKET_LIBRARIES})
target_include_directories(stream PRIVATE ${Iconv_INCLUDE_DIR})
set_target_properties(stream PROPERTIES VERSION ${STREAM_VERSION} SOVERSION
${STREAM_VERSION_MAJOR})
target_compile_definitions(stream PRIVATE LIBSTREAM)
diff --git a/gdk/gdk_hash.c b/gdk/gdk_hash.c
--- a/gdk/gdk_hash.c
+++ b/gdk/gdk_hash.c
@@ -37,6 +37,13 @@
#include "gdk_cand.h"
#include "gdk_private.h"
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+#define open _open
+#define close _close
+#define read _read
+#define write _write
+#endif
+
static int
HASHwidth(BUN hashsize)
{
diff --git a/gdk/gdk_orderidx.c b/gdk/gdk_orderidx.c
--- a/gdk/gdk_orderidx.c
+++ b/gdk/gdk_orderidx.c
@@ -10,6 +10,13 @@
#include "gdk.h"
#include "gdk_private.h"
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+#define open _open
+#define close _close
+#define read _read
+#define write _write
+#endif
+
#define ORDERIDX_VERSION ((oid) 3)
#ifdef PERSISTENTIDX
diff --git a/gdk/gdk_posix.h b/gdk/gdk_posix.h
--- a/gdk/gdk_posix.h
+++ b/gdk/gdk_posix.h
@@ -168,8 +168,11 @@ gdk_export char *dlerror(void);
#ifndef HAVE_GETTIMEOFDAY
gdk_export int gettimeofday(struct timeval *tv, int *ignore_zone);
#endif
+#ifdef NATIVE_WIN32
gdk_export int win_stat(const char *, struct stat *);
+#else
gdk_export int win_rmdir(const char *);
+#endif
gdk_export int win_rename(const char *, const char *);
gdk_export int win_unlink(const char *);
gdk_export int win_mkdir(const char *, const int mode);
diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -36,6 +36,13 @@
#define O_CLOEXEC 0
#endif
+#if defined(_MSC_VER) && _MSC_VER >= 1400
+#define open _open
+#define close _close
+#define read _read
+#define write _write
+#endif
+
/* GDKfilepath returns a newly allocated string containing the path
* name of a database farm.
* The arguments are the farmID or -1, the name of a subdirectory
diff --git a/gdk/gdk_utils.c b/gdk/gdk_utils.c
--- a/gdk/gdk_utils.c
+++ b/gdk/gdk_utils.c
@@ -48,6 +48,7 @@ int GDKverbose = 0;
#ifdef NATIVE_WIN32
#define chdir _chdir
+#define getpid _getpid
#endif
static ATOMIC_TYPE GDKstopped = ATOMIC_VAR_INIT(0);
diff --git a/geom/lib/CMakeLists.txt b/geom/lib/CMakeLists.txt
--- a/geom/lib/CMakeLists.txt
+++ b/geom/lib/CMakeLists.txt
@@ -8,6 +8,5 @@
include_directories(../../common/options ../../common/stream ../../gdk
${GEOS_INCS} ${PROJ_INCLUDE_DIR})
-add_library(geomobj STATIC libgeom.c libgeom.h)
+add_library(geomobj OBJECT libgeom.c libgeom.h)
set_target_properties(geomobj PROPERTIES POSITION_INDEPENDENT_CODE ON)
-target_compile_definitions(geomobj PRIVATE LIBGEOM)
diff --git a/monetdb_config.h.in b/monetdb_config.h.in
--- a/monetdb_config.h.in
+++ b/monetdb_config.h.in
@@ -33,11 +33,6 @@
#define WIN32_LEAN_AND_MEAN
#endif
-/* Visual Studio 8 has deprecated lots of stuff: suppress warnings */
-#ifndef _CRT_SECURE_NO_DEPRECATE
-#define _CRT_SECURE_NO_DEPRECATE
-#endif
-
/* indicate to sqltypes.h that windows.h has already been included and
that it doesn't have to define Windows constants */
#ifndef ALREADY_HAVE_WINDOWS_TYPE
diff --git a/sql/common/CMakeLists.txt b/sql/common/CMakeLists.txt
--- a/sql/common/CMakeLists.txt
+++ b/sql/common/CMakeLists.txt
@@ -8,7 +8,7 @@
include_directories(.. ../include ../storage ../../common/options
../../common/stream ../../monetdb5/mal ../../gdk)
-add_library(sqlcommon STATIC
+add_library(sqlcommon OBJECT
sql_mem.c sql_list.c sql_hash.c sql_stack.c
sql_backend.c
sql_keyword.c sql_changeset.c sql_types.c sql_string.c
sql_backend.h sql_string.h sql_types.h)
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -14,7 +14,7 @@ bison_target(sqlparser sql_parser.y ${CM
COMPILE_FLAGS "-d -p sql -r all"
DEFINES_FILE
${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.h)
-add_library(sqlserver STATIC
+add_library(sqlserver OBJECT
sql_atom.c
sql_datetime.c
sql_decimal.c
diff --git a/sql/storage/CMakeLists.txt b/sql/storage/CMakeLists.txt
--- a/sql/storage/CMakeLists.txt
+++ b/sql/storage/CMakeLists.txt
@@ -10,7 +10,7 @@ add_subdirectory(bat)
include_directories(. ../include ../common ../../common/options
../../common/stream ../../gdk)
-add_library(store STATIC
+add_library(store OBJECT
store_dependency.c store_sequence.c
store.c sql_catalog.c
sql_storage.h store_dependency.h
diff --git a/sql/storage/bat/CMakeLists.txt b/sql/storage/bat/CMakeLists.txt
--- a/sql/storage/bat/CMakeLists.txt
+++ b/sql/storage/bat/CMakeLists.txt
@@ -10,7 +10,7 @@ include_directories(.. ../../include ../
../../../monetdb5/modules/atoms
../../../monetdb5/modules/kernel ../../../monetdb5/mal
../../../monetdb5/modules/mal
../../../monetdb5/optimizer ../../../monetdb5/scheduler)
-add_library(batstore STATIC
+add_library(batstore OBJECT
bat_table.c bat_storage.c bat_logger.c bat_utils.c
res_table.c
bat_logger.h bat_storage.h bat_table.h bat_utils.h
res_table.h)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
