Skip to content

Commit

Permalink
Revert "remove extensions"
Browse files Browse the repository at this point in the history
This reverts commit 1543790.
  • Loading branch information
carlopi committed Sep 19, 2024
1 parent 30408c4 commit 58f5cd2
Showing 1 changed file with 20 additions and 2 deletions.
22 changes: 20 additions & 2 deletions lib/cmake/duckdb.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "")
set(DUCKDB_EXTENSIONS "fts;json")
# Escape semicolons in DUCKDB_EXTENSIONS before passing to ExternalProject_Add
string(REPLACE ";" "$<SEMICOLON>" DUCKDB_EXTENSIONS_PACKED "${DUCKDB_EXTENSIONS}")

Expand Down Expand Up @@ -57,7 +57,10 @@ ExternalProject_Add(
<INSTALL_DIR>/lib/libduckdb_yyjson.a
<INSTALL_DIR>/lib/libduckdb_pg_query.a
<INSTALL_DIR>/lib/libduckdb_utf8proc.a
<INSTALL_DIR>/lib/libduckdb_fastpforlib.a)
<INSTALL_DIR>/lib/libduckdb_fastpforlib.a
<INSTALL_DIR>/lib/libparquet_extension.a
<INSTALL_DIR>/lib/libfts_extension.a
<INSTALL_DIR>/lib/libjson_extension.a)

ExternalProject_Get_Property(duckdb_ep install_dir)
ExternalProject_Get_Property(duckdb_ep binary_dir)
Expand Down Expand Up @@ -102,4 +105,19 @@ target_include_directories(
INTERFACE ${DUCKDB_SOURCE_DIR}/third_party/thrift
INTERFACE ${DUCKDB_SOURCE_DIR}/third_party/zstd)

add_library(duckdb_fts STATIC IMPORTED)
set_property(TARGET duckdb_fts PROPERTY IMPORTED_LOCATION ${install_dir}/lib/libfts_extension.a)
target_include_directories(duckdb_fts INTERFACE ${DUCKDB_SOURCE_DIR}/extension/fts/include)

add_library(duckdb_parquet STATIC IMPORTED)
set_property(TARGET duckdb_parquet PROPERTY IMPORTED_LOCATION ${install_dir}/lib/libparquet_extension.a)
target_include_directories(duckdb_parquet INTERFACE ${DUCKDB_SOURCE_DIR}/extension/parquet/include)

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_dependencies(duckdb duckdb_ep)
add_dependencies(duckdb_fts duckdb_ep)
add_dependencies(duckdb_parquet duckdb_ep)
add_dependencies(duckdb_json duckdb_ep)

0 comments on commit 58f5cd2

Please sign in to comment.