From c50b31a7a5e2136a1ef2519940d261c038edc979 Mon Sep 17 00:00:00 2001 From: Alexey Milovidov Date: Sun, 21 Nov 2021 17:35:33 +0300 Subject: [PATCH] Remove trash --- base/mysqlxx/CMakeLists.txt | 5 +---- cmake/find/curl.cmake | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/base/mysqlxx/CMakeLists.txt b/base/mysqlxx/CMakeLists.txt index 947f61f9051..80db50c2593 100644 --- a/base/mysqlxx/CMakeLists.txt +++ b/base/mysqlxx/CMakeLists.txt @@ -13,10 +13,7 @@ add_library (mysqlxx target_include_directories (mysqlxx PUBLIC ..) -if (USE_INTERNAL_MYSQL_LIBRARY) - target_include_directories (mysqlxx PUBLIC "${ClickHouse_SOURCE_DIR}/contrib/mariadb-connector-c/include") - target_include_directories (mysqlxx PUBLIC "${ClickHouse_BINARY_DIR}/contrib/mariadb-connector-c/include") -else () +if (NOT USE_INTERNAL_MYSQL_LIBRARY) set(PLATFORM_LIBRARIES ${CMAKE_DL_LIBS}) if (USE_MYSQL) diff --git a/cmake/find/curl.cmake b/cmake/find/curl.cmake index dd27d82ef88..577b13698c2 100644 --- a/cmake/find/curl.cmake +++ b/cmake/find/curl.cmake @@ -22,8 +22,6 @@ if (NOT CURL_FOUND) # find_package(CURL) compatibility for the following packages that uses # find_package(CURL)/include(FindCURL): - # - mariadb-connector-c - # - aws-s3-cmake # - sentry-native set (CURL_FOUND ON CACHE BOOL "") set (CURL_ROOT_DIR ${CURL_LIBRARY_DIR} CACHE PATH "")