thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Try fix build

Browse Source
This commit is contained in:
kssenii 2020-12-30 16:00:05 +00:00
parent d146974058
commit 62b06de97e
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/find/libpqxx.cmake
View File

@ -18,13 +18,15 @@ if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/libpq/include")
return()
endif()
if (NOT USE_INTERNAL_SSL_LIBRARY)
set (USE_LIBPQXX 0)
message (STATUS "Using libpqxx=${USE_LIBPQXX}. (Internal ssl library is missing)")
else ()
set (USE_LIBPQXX 1)
set (LIBPQXX_LIBRARY libpqxx)
set (LIBPQ_LIBRARY libpq)
set (LIBPQXX_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpqxx/include")
set (LIBPQ_ROOT_DIR "${ClickHouse_SOURCE_DIR}/contrib/libpq")
message (STATUS "Using libpqxx=${USE_LIBPQXX}: ${LIBPQXX_INCLUDE_DIR} : ${LIBPQXX_LIBRARY}")
message (STATUS "Using libpq: ${LIBPQ_ROOT_DIR} : ${LIBPQ_INCLUDE_DIR} : ${LIBPQ_LIBRARY}")
endif()

2
contrib/libpq vendored

@ -1 +1 @@
Subproject commit e2d1a14f079bda7b4bebc203f41355bb433fc145
Subproject commit 8e7e905854714a7fbb49c124dbc45c7bd4b98e07

1
contrib/libpq-cmake/CMakeLists.txt
View File

@ -46,6 +46,7 @@ set(SRCS
${LIBPQ_SOURCE_DIR}/port/pgstrcasecmp.c
${LIBPQ_SOURCE_DIR}/port/thread.c
${LIBPQ_SOURCE_DIR}/port/path.c
${LIBPQ_SOURCE_DIR}/port/explicit_bzero.c
)
add_library(libpq ${SRCS})

2
src/Databases/PostgreSQL/DatabasePostgreSQL.h
View File

@ -31,7 +31,7 @@ public:
const bool cache_tables_);
String getEngineName() const override { return "PostgreSQL"; }
String getMetadataPath() const override { return metadata_path; };
String getMetadataPath() const override { return metadata_path; }
bool canContainMergeTreeTables() const override { return false; }
bool canContainDistributedTables() const override { return false; }