Skip to content

Commit d15b0c0

Browse files
committed
fix cmake
1 parent 76e22f7 commit d15b0c0

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

chsql/CMakeLists.txt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
cmake_minimum_required(VERSION 3.12)
22

3+
set(CMAKE_CXX_STANDARD 17)
4+
35
# Set extension name here
46
set(TARGET_NAME chsql)
57

@@ -28,14 +30,6 @@ include_directories(
2830
./src/include
2931
./src
3032
${CMAKE_CURRENT_SOURCE_DIR}/../duckdb/extension/parquet/include
31-
../duckdb/third_party/lz4
32-
../duckdb/third_party/parquet
33-
../duckdb/third_party/thrift
34-
../duckdb/third_party/snappy
35-
../duckdb/third_party/zstd/include
36-
../duckdb/third_party/mbedtls
37-
../duckdb/third_party/mbedtls/include
38-
../duckdb/third_party/brotli/include
3933
${CMAKE_CURRENT_SOURCE_DIR}/../contribs/clickhouse-cpp
4034
${CMAKE_CURRENT_SOURCE_DIR}/../contribs/clickhouse-cpp/contrib/absl
4135
)
@@ -51,13 +45,20 @@ build_static_extension(${TARGET_NAME} ${EXTENSION_SOURCES})
5145
build_loadable_extension(${TARGET_NAME} " " ${EXTENSION_SOURCES})
5246

5347
# Link libraries using plain signature
54-
target_link_libraries(${EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto clickhouse-cpp-lib absl_int128 cityhash lz4 zstdstatic)
55-
target_link_libraries(${LOADABLE_EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto clickhouse-cpp-lib absl_int128 cityhash lz4 zstdstatic)
48+
target_link_libraries(${EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto clickhouse-cpp-lib)
49+
target_link_libraries(${LOADABLE_EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto clickhouse-cpp-lib)
5650

5751
# Install targets
5852
install(
59-
TARGETS ${EXTENSION_NAME}
53+
TARGETS ${EXTENSION_NAME} clickhouse-cpp-lib absl_int128 cityhash lz4 zstdstatic
6054
EXPORT "${DUCKDB_EXPORT_SET}"
6155
LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
6256
ARCHIVE DESTINATION "${INSTALL_LIB_DIR}"
6357
)
58+
59+
# Make sure the export set includes clickhouse-cpp-lib and its dependencies
60+
export(
61+
TARGETS ${EXTENSION_NAME} clickhouse-cpp-lib absl_int128 cityhash lz4 zstdstatic
62+
NAMESPACE duckdb::
63+
FILE DuckDBExports.cmake
64+
)

0 commit comments

Comments
 (0)