Changeset: 21a51e2c4449 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/21a51e2c4449
Modified Files:
cmake/monetdb-defines.cmake
cmake/monetdb-findpackages.cmake
sql/backends/monet5/vaults/parquet/CMakeLists.txt
Branch: parquet
Log Message:
small fixes for parquet detection
diffs (118 lines):
diff --git a/cmake/monetdb-defines.cmake b/cmake/monetdb-defines.cmake
--- a/cmake/monetdb-defines.cmake
+++ b/cmake/monetdb-defines.cmake
@@ -140,7 +140,7 @@ macro(monetdb_macro_variables)
set(HAVE_PROJ ${PROJ_FOUND})
set(HAVE_SNAPPY ${SNAPPY_FOUND})
set(HAVE_FITS ${CFITSIO_FOUND})
- set(HAVE_PARQUET ${PARQUET_FOUND})
+ set(HAVE_PARQUET ${Parquet_FOUND})
set(HAVE_VALGRIND ${VALGRIND_FOUND})
set(HAVE_NETCDF ${NETCDF_FOUND})
set(HAVE_READLINE ${READLINE_FOUND})
diff --git a/cmake/monetdb-findpackages.cmake b/cmake/monetdb-findpackages.cmake
--- a/cmake/monetdb-findpackages.cmake
+++ b/cmake/monetdb-findpackages.cmake
@@ -81,19 +81,21 @@ if(GEOM)
endif()
if(PARQUET)
- find_package(PkgConfig REQUIRED)
- pkg_search_module(GLIB REQUIRED glib-2.0)
-
- include_directories(${GLIB_INCLUDE_DIRS})
- link_directories(${GLIB_LIBRARY_DIRS})
-
- add_definitions(${GLIB_CFLAGS_OTHER})
-
- find_package(Arrow CONFIG REQUIRED)
- find_package(Parquet CONFIG REQUIRED
- PATHS ${Arrow_DIR}
- NO_DEFAULT_PATH
- )
+ find_package(PkgConfig REQUIRED)
+ pkg_search_module(GLIB REQUIRED glib-2.0)
+ include_directories(${GLIB_INCLUDE_DIRS})
+ link_directories(${GLIB_LIBRARY_DIRS})
+ add_definitions(${GLIB_CFLAGS_OTHER})
+ find_package(Arrow REQUIRED CONFIG)
+ find_package(Parquet REQUIRED CONFIG
+ PATHS ${Arrow_DIR}
+ NO_DEFAULT_PATH
+ )
+ if (Parquet_FOUND)
+ message(STATUS "Parquet FOUND")
+ else()
+ message(STATUS "Parquet NOT FOUND")
+ endif()
endif()
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
@@ -1,44 +1,25 @@
-if(PARQUET)
- find_package(PkgConfig REQUIRED)
- pkg_search_module(GLIB REQUIRED glib-2.0)
-
- include_directories(${GLIB_INCLUDE_DIRS})
- link_directories(${GLIB_LIBRARY_DIRS})
-
- add_definitions(${GLIB_CFLAGS_OTHER})
+if(Parquet_FOUND)
+ add_library(parquet_lib MODULE)
- find_package(Arrow CONFIG REQUIRED)
- find_package(Parquet CONFIG REQUIRED
- PATHS ${Arrow_DIR}
- NO_DEFAULT_PATH
- )
-
- if(PARQUET_FOUND)
- add_library(parquet_lib MODULE)
+ target_sources(parquet_lib
+ PRIVATE
+ parquet.c
+ parquet.h
+ )
- target_sources(parquet_lib
- PRIVATE
- parquet.c
- parquet.h
- )
+ target_link_libraries(parquet_lib
+ PRIVATE
+ monetdb_config_header
+ monetdb5
+ bat
+ sqlinclude
+ Arrow
+ Parquet
+ )
- target_link_libraries(parquet_lib
- PRIVATE
- monetdb_config_header
- monetdb5
- bat
- sqlinclude
- Arrow
- Parquet
- )
-
- install(TARGETS
- parquet_lib
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
- COMPONENT server)
-
- else()
- message(FATAL_ERROR "Parquet was requested but was not found")
- endif()
+ install(TARGETS
+ parquet_lib
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/monetdb5
+ COMPONENT server)
endif()
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
