Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
7b36395e
Commit
7b36395e
authored
Aug 23, 2017
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-13630 : dont install connect-specific JAR files if connect is not built.
parent
db51ad1e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
7 deletions
+15
-7
storage/connect/CMakeLists.txt
storage/connect/CMakeLists.txt
+15
-7
No files found.
storage/connect/CMakeLists.txt
View file @
7b36395e
...
...
@@ -266,13 +266,6 @@ IF(CONNECT_WITH_JDBC)
JdbcInterface.java ApacheInterface.java MariadbInterface.java
MysqlInterface.java OracleInterface.java PostgresqlInterface.java
JavaWrappers.jar
)
# 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
${
CMAKE_CURRENT_SOURCE_DIR
}
/JavaWrappers.jar
${
CMAKE_CURRENT_BINARY_DIR
}
/JdbcInterface.jar
DESTINATION
${
INSTALL_PLUGINDIR
}
COMPONENT connect-engine
)
add_definitions
(
-DJDBC_SUPPORT
)
ELSE
()
SET
(
JDBC_LIBRARY
""
)
...
...
@@ -313,3 +306,18 @@ MYSQL_ADD_PLUGIN(connect ${CONNECT_SOURCES}
LINK_LIBRARIES
${
ZLIB_LIBRARY
}
${
XML_LIBRARY
}
${
ICONV_LIBRARY
}
${
ODBC_LIBRARY
}
${
JDBC_LIBRARY
}
${
IPHLPAPI_LIBRARY
}
)
IF
(
NOT TARGET connect
)
RETURN
()
ENDIF
()
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
${
CMAKE_CURRENT_SOURCE_DIR
}
/JavaWrappers.jar
${
CMAKE_CURRENT_BINARY_DIR
}
/JdbcInterface.jar
DESTINATION
${
INSTALL_PLUGINDIR
}
COMPONENT connect-engine
)
ENDIF
()
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment