database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

make CONNECT's finding Java and JNI less verbose

Browse Source
This commit is contained in:
Sergei Golubchik
2016-09-05 16:05:13 +02:00
parent 58f20b0c6e
commit 6152784cb1
2 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/FindJNI.cmake Normal file
View File

@ -0,0 +1,8 @@
if(DEFINED JAVA_AWT_LIBRARY)
return()
endif()
set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
unset(CMAKE_MODULE_PATH)
include(FindJava)
set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})

8
cmake/FindJava.cmake Normal file
View File

@ -0,0 +1,8 @@
if(DEFINED Java_JAVA_EXECUTABLE)
return()
endif()
set(orig_CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
unset(CMAKE_MODULE_PATH)
include(FindJava)
set(CMAKE_MODULE_PATH ${orig_CMAKE_MODULE_PATH})