diff options
Diffstat (limited to 'plugin/aws_key_management/CMakeLists.txt')
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 33 |
1 files changed, 11 insertions, 22 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 49f6b54a24c..e9e1b49d5f2 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -12,12 +12,7 @@ # Give message why the building this plugin is skipped (only if -DVERBOSE is defined) # or if plugin is explicitly requested to build. Then bail out. MACRO(SKIP_AWS_PLUGIN msg) - IF(VERBOSE OR "${PLUGIN_AWS_KEY_MANAGEMENT}" MATCHES "^(STATIC|DYNAMIC)$") - MESSAGE(STATUS "Can't build aws_key_management - ${msg}") - ENDIF() - IF(TARGET aws_key_management) - MESSAGE(FATAL_ERROR "Error configuring aws_key_management - aborting") - ENDIF() + MESSAGE_ONCE(SKIP_AWS_PLUGIN "Skip aws_key_management - ${msg}") RETURN() ENDMACRO() SET(CMAKE_CXX_STANDARD 11) @@ -26,15 +21,6 @@ IF(NOT NOT_FOR_DISTRIBUTION) SKIP_AWS_PLUGIN("AWS SDK has Apache 2.0 License which is not complatible with GPLv2. Set -DNOT_FOR_DISTRIBUTION=ON if you need this plugin") ENDIF() -MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc DISABLED - COMPONENT aws-key-management) - -IF(NOT TARGET aws_key_management) - RETURN() -ELSE() - SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE) -ENDIF() - # This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features) SET(CXX11_FLAGS) SET(OLD_COMPILER_MSG "AWS SDK requires c++11 -capable compiler (minimal supported versions are g++ 4.8, clang 3.3, VS2103)") @@ -130,13 +116,10 @@ ELSE() ENDFOREACH() # To be compatible with older cmake, we use older version of the SDK - # We increase the version for macs however, so the newest mac could built it. - IF(APPLE) - SET(GIT_TAG "1.0.100") - ELSEIF(_OPENSSL_VERSION VERSION_EQUAL "1.1") - SET(GIT_TAG "1.0.114") + IF(CMAKE_VERSION LESS "3.0") + SET(GIT_TAG "1.0.8") ELSE() - SET(GIT_TAG "1.0.8") + SET(GIT_TAG "1.2.11") ENDIF() SET(AWS_SDK_PATCH_COMMAND ) @@ -158,6 +141,7 @@ ELSE() "-DCMAKE_CXX_FLAGS_MINSIZEREL=${CMAKE_CXX_FLAGS_MINSIZEREL} ${PIC_FLAG}" ${EXTRA_SDK_CMAKE_FLAGS} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/aws_sdk_cpp + -DCMAKE_INSTALL_LIBDIR=lib TEST_COMMAND "" ) SET_TARGET_PROPERTIES(aws_sdk_cpp PROPERTIES EXCLUDE_FROM_ALL TRUE) @@ -181,5 +165,10 @@ IF(WIN32) ELSE() SET(AWS_CPP_SDK_DEPENDENCIES ${OPENSSL_LIBRARIES} ${CURL_LIBRARIES} ${UUID_LIBRARIES}) ENDIF() +MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc + LINK_LIBRARIES ${AWS_SDK_LIBS} ${AWS_CPP_SDK_DEPENDENCIES} + COMPONENT aws-key-management) -TARGET_LINK_LIBRARIES(aws_key_management ${AWS_SDK_LIBS} ${AWS_CPP_SDK_DEPENDENCIES}) +IF (TARGET aws_key_management) + SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE) +ENDIF() |