Changeset: eb40304223be for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/eb40304223be
Modified Files:
gdk/CMakeLists.txt
gdk/gdk.h
Branch: default
Log Message:
Do the Windows magic.
diffs (33 lines):
diff --git a/gdk/CMakeLists.txt b/gdk/CMakeLists.txt
--- a/gdk/CMakeLists.txt
+++ b/gdk/CMakeLists.txt
@@ -103,7 +103,8 @@ target_include_directories(bat
$<TARGET_PROPERTY:mstring,INTERFACE_INCLUDE_DIRECTORIES>
$<$<BOOL:${RTREE_FOUND}>:$<TARGET_PROPERTY:rtree::rtree,INTERFACE_INCLUDE_DIRECTORIES>>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>)
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/monetdb>
+ $<$<BOOL:${OPENSSL_FOUND}>:${OPENSSL_INCLUDE_DIR}>)
target_link_libraries(bat
PRIVATE
@@ -113,6 +114,7 @@ target_link_libraries(bat
monetdb_config_header
moptions
mutils
+ $<$<BOOL:${OPENSSL_FOUND}>:OpenSSL::SSL>
$<$<BOOL:${RTREE_FOUND}>:rtree::rtree>
$<$<NOT:$<PLATFORM_ID:Windows>>:m>
$<$<PLATFORM_ID:Windows>:ws2_32>
diff --git a/gdk/gdk.h b/gdk/gdk.h
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -1550,7 +1550,7 @@ gdk_export BAT *BATcasefold(BAT *b, BAT
gdk_export gdk_return GDKasciify(char **restrict buf, size_t *restrict buflen,
const char *restrict s);
gdk_export BAT *BATasciify(BAT *b, BAT *s);
#ifdef HAVE_OPENSSL
-gdk_return BATaggrdigest(allocator *ma, BAT **bnp, char **shap, const char
*digest, BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils);
+gdk_export gdk_return BATaggrdigest(allocator *ma, BAT **bnp, char **shap,
const char *digest, BAT *b, BAT *g, BAT *e, BAT *s, bool skip_nils);
#endif
gdk_export BAT *BATsample(BAT *b, BUN n);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
