From 28a12eda82fe21292f5274429eefa713ce7c6089 Mon Sep 17 00:00:00 2001 From: "david.hall" Date: Tue, 6 Sep 2022 16:15:07 -0500 Subject: [PATCH] Fix up CmakeLists.txt A better way to fix the dependencies --- dbcon/mysql/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbcon/mysql/CMakeLists.txt b/dbcon/mysql/CMakeLists.txt index 6741e96b0..eff43d84a 100644 --- a/dbcon/mysql/CMakeLists.txt +++ b/dbcon/mysql/CMakeLists.txt @@ -6,7 +6,7 @@ include_directories( ${ENGINE_COMMON_INCLUDES} ${SERVER_SOURCE_ROOT_DIR}/storage/maria ) SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../../) -SET(S3API_DEPS marias3 CACHE INTERNAL "S3API_DEPS") +SET(S3API_DEPS marias3 curl CACHE INTERNAL "S3API_DEPS") SET ( libcalmysql_SRCS @@ -53,7 +53,7 @@ else () SET_TARGET_PROPERTIES(ha_columnstore PROPERTIES PREFIX "") add_dependencies(ha_columnstore loggingcpp) - add_dependencies(ha_columnstore ${S3API_DEPS}) + add_dependencies(ha_columnstore marias3) add_definitions(-DMYSQL_DYNAMIC_PLUGIN -DPLUGIN_COLUMNSTORE_VERSION="${PACKAGE_VERSION}") target_link_libraries(ha_columnstore ${S3API_DEPS} ${ENGINE_LDFLAGS} ${ENGINE_WRITE_LIBS} ${NETSNMP_LIBRARIES} ${SERVER_BUILD_DIR}/libservices/libmysqlservices.a threadpool)