Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Experimental] Tracking duckdb main branch #1927

Open
wants to merge 15 commits into
base: main
Choose a base branch
from
Prev Previous commit
Next Next commit
Add core_functions library
  • Loading branch information
carlopi committed Dec 9, 2024
commit 90d3e7497a7303cb1a8b567d49cd13912a81f976
8 changes: 7 additions & 1 deletion lib/cmake/duckdb.cmake
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ endif()
set(DUCKDB_CXX_FLAGS "${DUCKDB_CXX_FLAGS} -Wno-unqualified-std-cast-call -DDUCKDB_DEBUG_NO_SAFETY -DDUCKDB_FROM_DUCKDB_WASM")
message("DUCKDB_CXX_FLAGS=${DUCKDB_CXX_FLAGS}")

set(DUCKDB_EXTENSIONS "json")
set(DUCKDB_EXTENSIONS "json;core_functions")
# Escape semicolons in DUCKDB_EXTENSIONS before passing to ExternalProject_Add
string(REPLACE ";" "$<SEMICOLON>" DUCKDB_EXTENSIONS_PACKED "${DUCKDB_EXTENSIONS}")

@@ -59,6 +59,7 @@ ExternalProject_Add(
<INSTALL_DIR>/lib/libduckdb_utf8proc.a
<INSTALL_DIR>/lib/libduckdb_fastpforlib.a
<INSTALL_DIR>/lib/libparquet_extension.a
<INSTALL_DIR>/lib/libcore_functions_extension.a
<INSTALL_DIR>/lib/libjson_extension.a)

ExternalProject_Get_Property(duckdb_ep install_dir)
@@ -89,6 +90,7 @@ target_link_libraries(
INTERFACE ${install_dir}/lib/libduckdb_pg_query.a
INTERFACE ${install_dir}/lib/libduckdb_utf8proc.a
INTERFACE ${install_dir}/lib/libduckdb_fastpforlib.a
INTERFACE ${install_dir}/lib/libcore_functions_extension.a
INTERFACE dl)

target_include_directories(
@@ -112,6 +114,10 @@ add_library(duckdb_json STATIC IMPORTED)
set_property(TARGET duckdb_json PROPERTY IMPORTED_LOCATION ${install_dir}/lib/libjson_extension.a)
target_include_directories(duckdb_json INTERFACE ${DUCKDB_SOURCE_DIR}/extension/json/include)

add_library(duckdb_core_functions STATIC IMPORTED)
set_property(TARGET duckdb_core_functions PROPERTY IMPORTED_LOCATION ${install_dir}/lib/libcore_functions_extension.a)
target_include_directories(duckdb_core_functions INTERFACE ${DUCKDB_SOURCE_DIR}/extension/json/include)

add_dependencies(duckdb duckdb_ep)
add_dependencies(duckdb_parquet duckdb_ep)
add_dependencies(duckdb_json duckdb_ep)