diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-03-17 18:55:39 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-03-19 19:40:33 +0100 |
| commit | b24a04c6e04ba3e1488426d7fd333ee564858be5 (patch) | |
| tree | e64092bb0b8d67402d4e39e9e997f778ae3e9436 /plugin | |
| parent | a1782b4ab92acddc326a6b9342d5e6b11bb24952 (diff) | |
| download | mariadb-git-b24a04c6e04ba3e1488426d7fd333ee564858be5.tar.gz | |
don't do anything for AWS plugin unless it's enabled
in particular, don't do ExternalProject_Add()
that starts creating build directories for a disabled
plugin
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 6b491186576..97bcfbb04db 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -18,6 +18,12 @@ MACRO(SKIP_AWS_PLUGIN msg) RETURN() ENDMACRO() +MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc DISABLED + COMPONENT aws-key-management) + +IF(NOT TARGET aws_key_management) + RETURN() +ENDIF() # This plugin needs recent C++ compilers (AWS C++ SDK header files are using C++11 features) SET(CXX11_FLAGS) @@ -145,7 +151,4 @@ ELSE() ENDIF() SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS}") -MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc - COMPONENT aws-key-management - LINK_LIBRARIES ${AWS_SDK_LIBS} - DISABLED) +TARGET_LINK_LIBRARIES(aws_key_management ${AWS_SDK_LIBS}) |