Changeset: 1a4dbe4f79e3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a4dbe4f79e3
Modified Files:
clients/odbc/winsetup/CMakeLists.txt
common/options/CMakeLists.txt
sql/storage/store.c
Branch: cmake-fun
Log Message:
Compilation fixes
diffs (47 lines):
diff --git a/clients/odbc/winsetup/CMakeLists.txt
b/clients/odbc/winsetup/CMakeLists.txt
--- a/clients/odbc/winsetup/CMakeLists.txt
+++ b/clients/odbc/winsetup/CMakeLists.txt
@@ -13,7 +13,7 @@ target_link_libraries(MonetODBCs PRIVATE
install(TARGETS MonetODBCs DESTINATION ${LIBDIR})
add_executable(odbcinstall install.c)
-target_link_libraries(odbcinstall PRIVATE MonetODBC_headers version shlwapi
${ODBC_LIBRARIES} ${ODBCINST_LIBRARIES})
+target_link_libraries(odbcinstall PRIVATE MonetODBC_headers mutils version
shlwapi ${ODBC_LIBRARIES} ${ODBCINST_LIBRARIES})
install(TARGETS odbcinstall DESTINATION ${BINDIR})
if(WIN32)
diff --git a/common/options/CMakeLists.txt b/common/options/CMakeLists.txt
--- a/common/options/CMakeLists.txt
+++ b/common/options/CMakeLists.txt
@@ -12,15 +12,8 @@ add_library(moptions_headers INTERFACE)
target_include_directories(moptions_headers INTERFACE
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
$<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
-if(WIN32)
- add_library(moptions SHARED ${OPTIONS_OBJECTS})
- target_compile_definitions(moptions PRIVATE LIBMOPTIONS LIBGDK LIBMAPI)
- install(TARGETS moptions DESTINATION ${LIBDIR})
- install(FILES $<TARGET_PDB_FILE:moptions> DESTINATION ${LIBDIR}
OPTIONAL)
-else()
- add_library(moptions STATIC ${OPTIONS_OBJECTS})
- set_target_properties(moptions PROPERTIES POSITION_INDEPENDENT_CODE ON)
-endif()
+add_library(moptions STATIC ${OPTIONS_OBJECTS})
+set_target_properties(moptions PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_link_libraries(moptions PUBLIC moptions_headers)
install(FILES monet_options.h DESTINATION ${INCLUDEDIR}/monetdb)
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -17,6 +17,10 @@
#include "bat/bat_table.h"
#include "bat/bat_logger.h"
+#ifdef NATIVE_WIN32
+#define close _close
+#endif
+
/* version 05.22.03 of catalog */
#define CATALOG_VERSION 52203
int catalog_version = 0;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
