Changeset: a74e55e78bfc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/a74e55e78bfc
Modified Files:
sql/backends/monet5/vaults/parquet/CMakeLists.txt
sql/backends/monet5/vaults/parquet/parquet.c
sql/backends/monet5/vaults/parquet/parquet.h
sql/server/CMakeLists.txt
Branch: parquet
Log Message:
fix compilation
diffs (71 lines):
diff --git a/sql/backends/monet5/vaults/parquet/CMakeLists.txt
b/sql/backends/monet5/vaults/parquet/CMakeLists.txt
--- a/sql/backends/monet5/vaults/parquet/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/parquet/CMakeLists.txt
@@ -7,6 +7,8 @@ if(Parquet_FOUND)
parquet.h
)
+
+
target_link_libraries(parquetlib
PRIVATE
monetdb_config_header
@@ -21,6 +23,18 @@ if(Parquet_FOUND)
parquet-glib
)
+ target_include_directories(parquetlib
+ PRIVATE
+ $<TARGET_PROPERTY:mal,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:malmodules,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:atoms,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sql,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlserver,INTERFACE_INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:sqlstorage,INTERFACE_INCLUDE_DIRECTORIES>
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+ $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
+
install(TARGETS
parquetlib
DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
diff --git a/sql/backends/monet5/vaults/parquet/parquet.c
b/sql/backends/monet5/vaults/parquet/parquet.c
--- a/sql/backends/monet5/vaults/parquet/parquet.c
+++ b/sql/backends/monet5/vaults/parquet/parquet.c
@@ -1,12 +1,12 @@
-#include "parquet.h"
#include <parquet-glib/parquet-glib.h>
#include <parquet-glib/arrow-file-reader.h>
#include <arrow-glib/arrow-glib.h>
#include <parquet-glib/metadata.h>
-#include <rel_file_loader.h>
+#include "monetdb_config.h"
+#include "rel_file_loader.h"
-extern void *GDKmalloc(size_t size); /* FIXME */
+#include "parquet.h"
parquet_file *open_file(char* filename) {
GParquetArrowFileReader *reader;
diff --git a/sql/backends/monet5/vaults/parquet/parquet.h
b/sql/backends/monet5/vaults/parquet/parquet.h
--- a/sql/backends/monet5/vaults/parquet/parquet.h
+++ b/sql/backends/monet5/vaults/parquet/parquet.h
@@ -19,4 +19,6 @@ parquet_file *open_file(char* filename);
parquet_table_metadata get_table_metadata(parquet_file *file);
+void parquet_init(void);
+
#endif
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -16,6 +16,7 @@ add_library(sqlserver STATIC)
set(sqlserver_public_headers
${CMAKE_CURRENT_SOURCE_DIR}/sql_parser.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/rel_file_loader.h
${CMAKE_CURRENT_SOURCE_DIR}/sql_mvc.h)
target_sources(sqlserver
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
