Changeset: 17666ce94ff1 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=17666ce94ff1
Modified Files:
sql/backends/monet5/vaults/bam/CMakeLists.txt
sql/backends/monet5/vaults/netcdf/CMakeLists.txt
sql/server/CMakeLists.txt
Branch: cmake-fun
Log Message:
Fix for clang compilation. Also give netcdf target another name to avoid
confusion with the library of same name.
diffs (71 lines):
diff --git a/sql/backends/monet5/vaults/bam/CMakeLists.txt
b/sql/backends/monet5/vaults/bam/CMakeLists.txt
--- a/sql/backends/monet5/vaults/bam/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/bam/CMakeLists.txt
@@ -17,7 +17,7 @@ if(WIN32)
list(APPEND BAM_LINK_LIBRARIES monetdb5 gdk)
endif()
-# the bam library is also called bam, so cmake gets confused. Give another name
+# the bam library is also called bam, so cmake gets confused. Give it another
name
add_library(bamm MODULE
bam_loader.c bam_loader.h
bam_wrapper.c bam_wrapper.h
diff --git a/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
b/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
--- a/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
+++ b/sql/backends/monet5/vaults/netcdf/CMakeLists.txt
@@ -17,14 +17,15 @@ if(WIN32)
list(APPEND NETCDF_LINK_LIBRARIES monetdb5 gdk)
endif()
-add_library(netcdf MODULE netcdf.c netcdf_vault.h)
-target_link_libraries(netcdf PRIVATE ${NETCDF_LINK_LIBRARIES})
-set_target_properties(netcdf PROPERTIES OUTPUT_NAME _netcdf)
-target_compile_definitions(netcdf PRIVATE LIBNCDF)
+# the netcdf library is also called netcdf, so cmake gets confused. Give it
another name
+add_library(netcdff MODULE netcdf.c netcdf_vault.h)
+target_link_libraries(netcdff PRIVATE ${NETCDF_LINK_LIBRARIES})
+set_target_properties(netcdff PROPERTIES OUTPUT_NAME _netcdf)
+target_compile_definitions(netcdff PRIVATE LIBNCDF)
-install(TARGETS netcdf DESTINATION ${LIBDIR}/monetdb5)
+install(TARGETS netcdff DESTINATION ${LIBDIR}/monetdb5)
if(WIN32)
- install(FILES $<TARGET_PDB_FILE:netcdf> DESTINATION ${LIBDIR}/monetdb5
OPTIONAL)
+ install(FILES $<TARGET_PDB_FILE:netcdff> DESTINATION ${LIBDIR}/monetdb5
OPTIONAL)
endif()
install(FILES netcdf.mal DESTINATION ${LIBDIR}/monetdb5)
install(FILES 74_netcdf.mal DESTINATION ${LIBDIR}/monetdb5/autoload)
diff --git a/sql/server/CMakeLists.txt b/sql/server/CMakeLists.txt
--- a/sql/server/CMakeLists.txt
+++ b/sql/server/CMakeLists.txt
@@ -11,8 +11,13 @@ include_directories(. ../include ../comm
../../common/stream ../../common/utils
../../gdk ${CMAKE_CURRENT_BINARY_DIR})
bison_target(sqlparser sql_parser.y
${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.c
- COMPILE_FLAGS "-d -p sql -r all"
- DEFINES_FILE
${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.h)
+ COMPILE_FLAGS "-d -p sql -r all" DEFINES_FILE
${CMAKE_CURRENT_BINARY_DIR}/sql_parser.tab.h)
+add_library(bison_obj OBJECT ${BISON_sqlparser_OUTPUTS})
+set_target_properties(bison_obj PROPERTIES POSITION_INDEPENDENT_CODE ON)
+check_c_compiler_flag("-Wno-unreachable-code"
COMPILER_-Wno-unreachable-code_FLAG)
+if(COMPILER_-Wno-unreachable-code_FLAG)
+ target_compile_options(bison_obj PRIVATE -Wno-unreachable-code) # use
this flag only to compile the bison output
+endif()
add_library(sqlserver STATIC
sql_atom.c
@@ -22,7 +27,6 @@ add_library(sqlserver STATIC
sql_qc.c
sql_symbol.c
sql_scan.c
- ${BISON_sqlparser_OUTPUTS}
sql_partition.c
sql_mvc.c
sql_env.c
@@ -52,5 +56,6 @@ add_library(sqlserver STATIC
sql_decimal.h sql_env.h sql_mvc.h sql_parser.h
sql_privileges.h sql_qc.h sql_scan.h
sql_semantic.h sql_symbol.h sql_tokens.h
sql_partition.h)
+target_link_libraries(sqlserver PRIVATE bison_obj)
set_target_properties(sqlserver PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_compile_definitions(sqlserver PRIVATE LIBSQL LIBSQLSERVER LIBSQLCOMMON
LIBBATSTORE LIBSTORE)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
