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

Addition to prev. revision #2789

Browse Source
This commit is contained in:
Alexey Milovidov 2018-08-03 22:29:07 +03:00
parent a70301d1f2
commit 54a9ff59cd
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/find_odbc.cmake
View File

@ -25,10 +25,11 @@ if (USE_INTERNAL_ODBC_LIBRARY AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/u
set (USE_INTERNAL_ODBC_LIBRARY 0)
endif ()
set (ODBC_INCLUDE_DIRECTORIES ) # Include directories will be either used automatically by target_include_directories or set later.
if (ENABLE_ODBC)
if (USE_INTERNAL_ODBC_LIBRARY)
set (ODBC_LIBRARIES unixodbc)
set (ODBC_INCLUDE_DIRECTORIES ) # Include directories will be used automatically by target_include_directories.
set (ODBC_FOUND 1)
set (USE_ODBC 1)
else ()

3
contrib/unixodbc-cmake/CMakeLists.txt
View File

@ -285,6 +285,3 @@ target_include_directories(unixodbc PUBLIC ${ODBC_SOURCE_DIR}/include)
target_compile_definitions(unixodbc PRIVATE -DHAVE_CONFIG_H)
target_compile_options(unixodbc PRIVATE -Wno-dangling-else -Wno-parentheses -Wno-misleading-indentation -Wno-unknown-warning-option -O2)
set(ODBC_FOUND 1)
set(ODBC_INCLUDE_DIRECTORIES )