diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-04 08:50:01 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-04 08:50:01 +0000 |
| commit | 6d417a0bad205a6bacfee10dbc46dd631b093e75 (patch) | |
| tree | 33ea3ef239f7f6ba79604fc850e1c1e80deb19d2 /plugin | |
| parent | 6e105d75351dfcfd103c7b60838e59f1fd6b4749 (diff) | |
| download | mariadb-git-6d417a0bad205a6bacfee10dbc46dd631b093e75.tar.gz | |
Fix aws_key_management compilation after mismerge
Also do not use BUILD_BYPRODUCTS in ExternalPeoject for older cmake
Diffstat (limited to 'plugin')
| -rw-r--r-- | plugin/aws_key_management/CMakeLists.txt | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/plugin/aws_key_management/CMakeLists.txt b/plugin/aws_key_management/CMakeLists.txt index 1c80b44ede7..66b8074406f 100644 --- a/plugin/aws_key_management/CMakeLists.txt +++ b/plugin/aws_key_management/CMakeLists.txt @@ -103,7 +103,9 @@ ELSE() ADD_LIBRARY(${lib} STATIC IMPORTED GLOBAL) ADD_DEPENDENCIES(${lib} aws_sdk_cpp) SET(loc "${CMAKE_CURRENT_BINARY_DIR}/aws_sdk_cpp/lib/${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX}") - SET(byproducts ${byproducts} BUILD_BYPRODUCTS ${loc}) + IF(CMAKE_VERSION VERSION_GREATER "3.1") + SET(byproducts ${byproducts} BUILD_BYPRODUCTS ${loc}) + ENDIF() SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION ${loc}) ENDFOREACH() @@ -139,14 +141,13 @@ ENDIF() ADD_DEFINITIONS(${SSL_DEFINES}) # Need to know whether openssl should be initialized SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_FLAGS}") -MYSQL_ADD_PLUGIN(aws_key_management aws_key_management_plugin.cc - LINK_LIBRARIES ${AWS_SDK_LIBS} - COMPONENT aws-key-management) - IF(WIN32) SET(AWS_CPP_SDK_DEPENDENCIES bcrypt winhttp wininet userenv version) ELSE() SET(AWS_CPP_SDK_DEPENDENCIES ${SSL_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}) |