Changeset: e20a00282f29 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e20a00282f29
Modified Files:
clients/odbc/winsetup/CMakeLists.txt
clients/odbc/winsetup/install.c
Branch: oscar
Log Message:
On Windows create and install the ODBC setup program.
diffs (44 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
@@ -35,8 +35,29 @@ target_link_libraries(MonetODBCs
$<$<PLATFORM_ID:Windows>:user32>
$<$<PLATFORM_ID:Windows>:legacy_stdio_definitions>)
+add_executable(odbcinstall
+ install.c)
+
+target_link_libraries(odbcinstall
+ PRIVATE
+ monetdb_config_header
+ mutils
+ $<$<PLATFORM_ID:Windows>:odbc32>
+ $<$<PLATFORM_ID:Windows>:odbccp32>
+ $<$<PLATFORM_ID:Windows>:shlwapi>
+ $<$<PLATFORM_ID:Windows>:user32>
+ $<$<PLATFORM_ID:Windows>:legacy_stdio_definitions>)
+
+target_include_directories(odbcinstall
+ PRIVATE
+ ../driver
+ PUBLIC
+ $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
+set(SOURCES install.c ../driver/ODBCGlobal.h)
+
install(TARGETS
MonetODBCs
+ odbcinstall
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR}
COMPONENT odbc
diff --git a/clients/odbc/winsetup/install.c b/clients/odbc/winsetup/install.c
--- a/clients/odbc/winsetup/install.c
+++ b/clients/odbc/winsetup/install.c
@@ -7,6 +7,7 @@
*/
#include "ODBCGlobal.h"
+#undef DATADIR
#include <winver.h>
#include <shlwapi.h>
#include <string.h>
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
