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

Make poco library path variable scope less global

Browse Source
This commit is contained in:
Azat Khuzhin 2020-12-23 23:44:50 +03:00
parent 7c76bd2def
commit 763844beac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/find/poco.cmake
View File

@ -1,8 +1,6 @@
option (USE_INTERNAL_POCO_LIBRARY "Use internal Poco library" ON) option (USE_INTERNAL_POCO_LIBRARY "Use internal Poco library" ON)
if (USE_INTERNAL_POCO_LIBRARY) if (NOT USE_INTERNAL_POCO_LIBRARY)
set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/poco)
else ()
find_path (ROOT_DIR NAMES Foundation/include/Poco/Poco.h include/Poco/Poco.h) find_path (ROOT_DIR NAMES Foundation/include/Poco/Poco.h include/Poco/Poco.h)
if (NOT ROOT_DIR) if (NOT ROOT_DIR)
message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system poco") message (${RECONFIGURE_MESSAGE_LEVEL} "Can't find system poco")

2
contrib/poco-cmake/CMakeLists.txt
View File

@ -1,3 +1,5 @@
set (LIBRARY_DIR ${ClickHouse_SOURCE_DIR}/contrib/poco)
add_subdirectory (Crypto) add_subdirectory (Crypto)
add_subdirectory (Data) add_subdirectory (Data)
add_subdirectory (Data/ODBC) add_subdirectory (Data/ODBC)