From f4543f4b4ec363d0548d83d9760f8f1baccc1ffd Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Tue, 19 Apr 2022 19:05:42 +0300 Subject: [PATCH] Respect library type for contrib libraries (#36399) The following libraries forces STATIC: - rockdb - libstemmer-c - lemmagen - mariadb-connector-c This is a preparation for USE_STATIC_LIBRARIES=OFF Signed-off-by: Azat Khuzhin --- contrib/lemmagen-c-cmake/CMakeLists.txt | 2 +- contrib/libstemmer-c-cmake/CMakeLists.txt | 2 +- contrib/mariadb-connector-c-cmake/CMakeLists.txt | 2 +- contrib/rocksdb-cmake/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/lemmagen-c-cmake/CMakeLists.txt b/contrib/lemmagen-c-cmake/CMakeLists.txt index 67e1e5791ca..0d9193c04a6 100644 --- a/contrib/lemmagen-c-cmake/CMakeLists.txt +++ b/contrib/lemmagen-c-cmake/CMakeLists.txt @@ -5,6 +5,6 @@ set(SRCS "${LIBRARY_DIR}/src/RdrLemmatizer.cpp" ) -add_library(_lemmagen STATIC ${SRCS}) +add_library(_lemmagen ${SRCS}) target_include_directories(_lemmagen SYSTEM PUBLIC "${LEMMAGEN_INCLUDE_DIR}") add_library(ch_contrib::lemmagen ALIAS _lemmagen) diff --git a/contrib/libstemmer-c-cmake/CMakeLists.txt b/contrib/libstemmer-c-cmake/CMakeLists.txt index 6dc65c56c6c..505d4df3b1d 100644 --- a/contrib/libstemmer-c-cmake/CMakeLists.txt +++ b/contrib/libstemmer-c-cmake/CMakeLists.txt @@ -27,6 +27,6 @@ FOREACH ( LINE ${_CONTENT} ) endforeach () # all the sources parsed. Now just add the lib -add_library(_stemmer STATIC ${_SOURCES} ${_HEADERS} ) +add_library(_stemmer ${_SOURCES} ${_HEADERS} ) target_include_directories(_stemmer SYSTEM PUBLIC "${STEMMER_INCLUDE_DIR}") add_library(ch_contrib::stemmer ALIAS _stemmer) diff --git a/contrib/mariadb-connector-c-cmake/CMakeLists.txt b/contrib/mariadb-connector-c-cmake/CMakeLists.txt index 1d9f750acee..50287c54ac1 100644 --- a/contrib/mariadb-connector-c-cmake/CMakeLists.txt +++ b/contrib/mariadb-connector-c-cmake/CMakeLists.txt @@ -239,7 +239,7 @@ endif() set(LIBMARIADB_SOURCES ${LIBMARIADB_SOURCES} ${CC_SOURCE_DIR}/libmariadb/mariadb_async.c ${CC_SOURCE_DIR}/libmariadb/ma_context.c) -add_library(_mariadbclient STATIC ${LIBMARIADB_SOURCES}) +add_library(_mariadbclient ${LIBMARIADB_SOURCES}) target_link_libraries(_mariadbclient ${SYSTEM_LIBS}) target_include_directories(_mariadbclient PRIVATE ${CC_BINARY_DIR}/include-private) diff --git a/contrib/rocksdb-cmake/CMakeLists.txt b/contrib/rocksdb-cmake/CMakeLists.txt index 529d7f0c4e3..b9dd2558348 100644 --- a/contrib/rocksdb-cmake/CMakeLists.txt +++ b/contrib/rocksdb-cmake/CMakeLists.txt @@ -539,7 +539,7 @@ if(WITH_FOLLY_DISTRIBUTED_MUTEX) "${ROCKSDB_SOURCE_DIR}/third-party/folly/folly/synchronization/WaitOptions.cpp") endif() -add_library(_rocksdb STATIC ${SOURCES}) +add_library(_rocksdb ${SOURCES}) add_library(ch_contrib::rocksdb ALIAS _rocksdb) target_link_libraries(_rocksdb PRIVATE ${THIRDPARTY_LIBS} ${SYSTEM_LIBS}) # SYSTEM is required to overcome some issues