diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-19 16:47:45 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2019-02-19 16:47:45 +0100 |
| commit | 91d506cf2d5c143f7eb74e776b1417cf2acaacd8 (patch) | |
| tree | a28ef3ac281a9d1b870d0cfab8c1cf673561a9bc /plugin | |
| parent | 88b6dc4db5567951f9c0d0baa6e965d44a7130b1 (diff) | |
| parent | 431da59f1ce2b594ef465563bf18f670f07a1b32 (diff) | |
| download | mariadb-git-91d506cf2d5c143f7eb74e776b1417cf2acaacd8.tar.gz | |
Merge branch '10.1' into 10.2
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index aa93fc3aa03..e9e1b49d5f2 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -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() |