summaryrefslogtreecommitdiff
path: root/storage/connect
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2016-06-22 15:31:58 +0200
committerSergei Golubchik <serg@mariadb.org>2016-06-22 16:12:50 +0200
commite16780619630676f822248f3637972235481fd96 (patch)
treea5c1d2f3c53cfc7b7b6c9e5e8bce2968ecefa5ad /storage/connect
parent26bf066d566371abc04e15c9d9415cfcc75833cb (diff)
downloadmariadb-git-e16780619630676f822248f3637972235481fd96.tar.gz
compilation failures
windows: use GetProcAddress() to access internal server data structures rhel5: CONNECT-JDBC requires at least Java 1.6
Diffstat (limited to 'storage/connect')
-rw-r--r--storage/connect/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/storage/connect/CMakeLists.txt b/storage/connect/CMakeLists.txt
index 254d074612a..c6b808acc60 100644
--- a/storage/connect/CMakeLists.txt
+++ b/storage/connect/CMakeLists.txt
@@ -243,8 +243,8 @@ IF(CONNECT_WITH_JDBC)
# TODO: Find how to compile and install the java wrapper class
# Find required libraries and include directories
- FIND_PACKAGE(Java)
- FIND_PACKAGE(JNI)
+ FIND_PACKAGE(Java 1.6)
+ FIND_PACKAGE(JNI)
IF (JAVA_FOUND AND JNI_FOUND)
INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH})
INCLUDE_DIRECTORIES(${JAVA_INCLUDE_PATH2})