Changeset: 3560745efc4e for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/3560745efc4e
Modified Files:
sql/backends/monet5/vaults/odbc/CMakeLists.txt
sql/server/rel_remote.h
Branch: odbc_loader
Log Message:
link in some more libraries
diffs (45 lines):
diff --git a/sql/backends/monet5/vaults/odbc/CMakeLists.txt
b/sql/backends/monet5/vaults/odbc/CMakeLists.txt
--- a/sql/backends/monet5/vaults/odbc/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/odbc/CMakeLists.txt
@@ -21,8 +21,8 @@ if(ODBC_FOUND)
PRIVATE
$<$<BOOL:${ODBC_FOUND}>:${ODBC_INCLUDE_DIRS}>
$<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:malmodules,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:atoms,INTERFACE_INCLUDE_DIRECTORIES>
- $<TARGET_PROPERTY:malmodules,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:sql,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:sqlserver,INTERFACE_INCLUDE_DIRECTORIES>
$<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
@@ -33,9 +33,10 @@ if(ODBC_FOUND)
target_link_libraries(odbc_loader
PRIVATE
monetdb_config_header
- bat
+ sqlinclude
+ sql
monetdb5
- sqlinclude)
+ bat)
set_target_properties(odbc_loader
PROPERTIES
diff --git a/sql/server/rel_remote.h b/sql/server/rel_remote.h
--- a/sql/server/rel_remote.h
+++ b/sql/server/rel_remote.h
@@ -16,12 +16,11 @@
#include "sql_relation.h"
#include "msettings.h"
-// maybe this needs to be somewhere more global?
-extern msettings *sa_msettings_create(allocator *sa);
-extern char *sa_msettings_to_string(const msettings *mp, allocator *sa, size_t
size_hint);
+sql_export msettings *sa_msettings_create(allocator *sa);
+sql_export char *sa_msettings_to_string(const msettings *mp, allocator *sa,
size_t size_hint);
sql_export int mapiuri_valid( const char *uri, allocator *sa);
-extern const char *mapiuri_uri(const char *uri, allocator *sa);
+sql_export const char *mapiuri_uri(const char *uri, allocator *sa);
extern const char *mapiuri_schema(const char *uri, allocator *sa, const char
*fallback);
extern const char *mapiuri_table(const char *uri, allocator *sa, const char
*fallback);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
