summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2017-08-23 23:30:51 +0000
committerVladislav Vaintroub <wlad@mariadb.com>2017-08-23 23:30:51 +0000
commit7aa846e9e30293e0bac7613abfd254405cfe9e09 (patch)
treeec6797b59218e1ddab0278350b08fc199388630f
parent7b36395ee962e7272d2544c61bf6142df2aba0b4 (diff)
downloadmariadb-git-7aa846e9e30293e0bac7613abfd254405cfe9e09.tar.gz
CONNECT engine: install ha_connect.lib
-rw-r--r--storage/connect/CMakeLists.txt15
1 files changed, 14 insertions, 1 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index 8df552505d1..9f42b7a87dd 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -310,12 +310,25 @@ IF(NOT TARGET connect)
RETURN()
ENDIF()
+# Install some extra files that belong to connect engine
+IF(WIN32)
+ # install ha_connect.lib
+ GET_TARGET_PROPERTY(CONNECT_LOCATION connect LOCATION)
+ STRING(REPLACE "dll" "lib" CONNECT_LIB ${CONNECT_LOCATION})
+ IF(CMAKE_CONFIGURATION_TYPES)
+ STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
+ CONNECT_LIB ${CONNECT_LIB})
+ ENDIF()
+ INSTALL(FILES ${CONNECT_LIB}
+ DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)
+ENDIF(WIN32)
+
IF(CONNECT_WITH_JDBC AND JAVA_FOUND AND JNI_FOUND)
# TODO: Find how to compile and install the java wrapper classes
# Find required libraries and include directories
SET (JAVA_SOURCES JdbcInterface.java)
add_jar(JdbcInterface ${JAVA_SOURCES})
- INSTALL(FILES
+ INSTALL(FILES
${CMAKE_CURRENT_SOURCE_DIR}/JavaWrappers.jar
${CMAKE_CURRENT_BINARY_DIR}/JdbcInterface.jar
DESTINATION ${INSTALL_PLUGINDIR} COMPONENT connect-engine)