Changeset: f6e9d8ed4e30 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=f6e9d8ed4e30
Modified Files:
common/utils/CMakeLists.txt
common/utils/mprompt.h
Branch: cmake-fun
Log Message:
Compiles, installs and runs on Windows!!!
diffs (28 lines):
diff --git a/common/utils/CMakeLists.txt b/common/utils/CMakeLists.txt
--- a/common/utils/CMakeLists.txt
+++ b/common/utils/CMakeLists.txt
@@ -13,9 +13,11 @@ target_compile_definitions(mutils PRIVAT
install(TARGETS mutils DESTINATION ${LIBDIR})
add_library(mcrypt SHARED mcrypt.h mcrypt.c)
+target_link_libraries(mcrypt PRIVATE ${CRYPTO_LIBRARIES})
target_compile_definitions(mcrypt PRIVATE LIBMAPI LIBMCRYPT)
install(TARGETS mcrypt DESTINATION ${LIBDIR})
add_library(msabaoth SHARED muuid.h muuid.c msabaoth.h msabaoth.c)
+target_link_libraries(msabaoth PRIVATE ${CRYPTO_LIBRARIES} mutils)
target_compile_definitions(msabaoth PRIVATE LIBMSABAOTH LIBMUUID LIBMAL
LIBATOMS LIBKERNEL LIBOPTIMIZER LIBSCHEDULER LIBMONETDB5)
install(TARGETS msabaoth DESTINATION ${LIBDIR})
diff --git a/common/utils/mprompt.h b/common/utils/mprompt.h
--- a/common/utils/mprompt.h
+++ b/common/utils/mprompt.h
@@ -6,5 +6,7 @@
* Copyright 1997 - July 2008 CWI, August 2008 - 2019 MonetDB B.V.
*/
-extern char *prompt_getlogin(void);
-extern char *simple_prompt(const char *prompt, int maxlen, int echo, const
char *def);
+#include "mutils.h"
+
+mutils_export char *prompt_getlogin(void);
+mutils_export char *simple_prompt(const char *prompt, int maxlen, int echo,
const char *def);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
