mirror of
https://github.com/MariaDB/server.git
synced 2025-02-13 08:55:35 +01:00
Don't build aws_key_management plugin by default
This commit is contained in:
parent
346e460896
commit
2de0b57dd1
4 changed files with 9 additions and 3 deletions
|
@ -500,5 +500,5 @@ ENDIF()
|
||||||
|
|
||||||
IF(NON_DISTRIBUTABLE_WARNING)
|
IF(NON_DISTRIBUTABLE_WARNING)
|
||||||
MESSAGE(WARNING "
|
MESSAGE(WARNING "
|
||||||
You have linked MariaDB with GPLv3 libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with Free Software Foundation.")
|
You have linked MariaDB with ${NON_DISTRIBUTABLE_WARNING} libraries! You may not distribute the resulting binary. If you do, you will put yourself into a legal problem with the Free Software Foundation.")
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
|
@ -157,7 +157,7 @@ MACRO (MYSQL_FIND_SYSTEM_READLINE)
|
||||||
SET(USE_NEW_READLINE_INTERFACE 1)
|
SET(USE_NEW_READLINE_INTERFACE 1)
|
||||||
ELSE()
|
ELSE()
|
||||||
IF(NOT_FOR_DISTRIBUTION)
|
IF(NOT_FOR_DISTRIBUTION)
|
||||||
SET(NON_DISTRIBUTABLE_WARNING 1)
|
SET(NON_DISTRIBUTABLE_WARNING "GPLv3")
|
||||||
SET(USE_NEW_READLINE_INTERFACE 1)
|
SET(USE_NEW_READLINE_INTERFACE 1)
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(USE_NEW_READLINE_INTERFACE 0)
|
SET(USE_NEW_READLINE_INTERFACE 0)
|
||||||
|
|
|
@ -258,7 +258,7 @@ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -DPACKAGE=test) # b
|
||||||
CHECK_INCLUDE_FILES (bfd.h BFD_H_EXISTS)
|
CHECK_INCLUDE_FILES (bfd.h BFD_H_EXISTS)
|
||||||
IF(BFD_H_EXISTS)
|
IF(BFD_H_EXISTS)
|
||||||
IF(NOT_FOR_DISTRIBUTION)
|
IF(NOT_FOR_DISTRIBUTION)
|
||||||
SET(NON_DISTRIBUTABLE_WARNING 1)
|
SET(NON_DISTRIBUTABLE_WARNING "GPLv3")
|
||||||
SET(HAVE_BFD_H 1)
|
SET(HAVE_BFD_H 1)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
|
@ -22,11 +22,17 @@ MACRO(SKIP_AWS_PLUGIN msg)
|
||||||
ENDMACRO()
|
ENDMACRO()
|
||||||
SET(CMAKE_CXX_STANDARD 11)
|
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()
|
||||||
|
|
||||||
MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc DISABLED
|
MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc DISABLED
|
||||||
COMPONENT aws-key-management)
|
COMPONENT aws-key-management)
|
||||||
|
|
||||||
IF(NOT TARGET aws_key_management)
|
IF(NOT TARGET aws_key_management)
|
||||||
RETURN()
|
RETURN()
|
||||||
|
ELSE()
|
||||||
|
SET(NON_DISTRIBUTABLE_WARNING "Apache 2.0" PARENT_SCOPE)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
# This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features)
|
# This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features)
|
||||||
|
|
Loading…
Add table
Reference in a new issue