mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-30 12:15:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.1' into 10.2

Browse source
This commit is contained in:
Oleksandr Byelkin 2019-02-19 16:47:45 +01:00
commit 91d506cf2d
5 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
plugin/aws_key_management/CMakeLists.txt
View file

@ -17,7 +17,9 @@ MACRO(SKIP_AWS_PLUGIN msg)
ENDMACRO()
SET(CMAKE_CXX_STANDARD 11)
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()
# This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features)
SET(CXX11_FLAGS)
@ -167,4 +169,6 @@ MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc
LINK_LIBRARIES ${AWS_SDK_LIBS} ${AWS_CPP_SDK_DEPENDENCIES}
COMPONENT aws-key-management)
IF (TARGET aws_key_management)
SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE)
ENDIF()