Changeset: bba6ac44fb80 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/bba6ac44fb80
Modified Files:
monetdb5/modules/atoms/pg_jsonpath/CMakeLists.txt
monetdb5/tools/CMakeLists.txt
Branch: json-extend
Log Message:
simplify cmake a bit
diffs (67 lines):
diff --git a/monetdb5/modules/atoms/pg_jsonpath/CMakeLists.txt
b/monetdb5/modules/atoms/pg_jsonpath/CMakeLists.txt
--- a/monetdb5/modules/atoms/pg_jsonpath/CMakeLists.txt
+++ b/monetdb5/modules/atoms/pg_jsonpath/CMakeLists.txt
@@ -25,17 +25,8 @@ BISON_TARGET(jsonpath_parser
target_sources(pg_jsonpath
PRIVATE
- # ${CMAKE_CURRENT_SOURCE_DIR}/jsonpath.c
- jsonpath_internal.h
- postgres_defines.h
- postgres_defines_internal.h
- ${FLEX_jsonpath_scanner_OUTPUT_HEADER}
${FLEX_jsonpath_scanner_OUTPUTS}
- ${BISON_jsonpath_parser_OUTPUT_HEADER}
- ${BISON_jsonpath_parser_OUTPUT_SOURCE}
- PUBLIC
- ${CMAKE_CURRENT_SOURCE_DIR}/jsonpath.h
- )
+ ${BISON_jsonpath_parser_OUTPUT_SOURCE})
target_link_libraries(pg_jsonpath
PRIVATE
@@ -46,11 +37,9 @@ target_link_libraries(pg_jsonpath
target_include_directories(pg_jsonpath
PRIVATE
- $<TARGET_PROPERTY:sqlcommon,INTERFACE_INCLUDE_DIRECTORIES>
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
PUBLIC
- $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
- $<INSTALL_INTERFACE:${INCLUDEDIR}/monetdb>)
+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_compile_definitions(pg_jsonpath
diff --git a/monetdb5/tools/CMakeLists.txt b/monetdb5/tools/CMakeLists.txt
--- a/monetdb5/tools/CMakeLists.txt
+++ b/monetdb5/tools/CMakeLists.txt
@@ -10,12 +10,7 @@
# Copyright 1997 - July 2008 CWI.
#]]
-add_library(monetdb5 SHARED
- $<TARGET_OBJECTS:mal>
- $<TARGET_OBJECTS:atoms>
- $<TARGET_OBJECTS:malmodules>
- $<TARGET_OBJECTS:kernel>
- $<TARGET_OBJECTS:optimizer>)
+add_library(monetdb5 SHARED)
target_link_libraries(monetdb5
PRIVATE
@@ -27,6 +22,14 @@ target_link_libraries(monetdb5
$<$<BOOL:${LibXml2_FOUND}>:LibXml2::LibXml2>
$<$<BOOL:${PCRE_FOUND}>:PCRE::PCRE>
$<$<BOOL:${Iconv_FOUND}>:Iconv::Iconv>
+ mal
+ atoms
+ malmodules
+ kernel
+ optimizer
+ pg_jsonpath
+ sqlinclude
+ sqlcommon
bat)
set_target_properties(monetdb5
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
