From 6152784cb1fa6981b3d54cf896b0b59ce01410e8 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Mon, 5 Sep 2016 16:05:13 +0200 Subject: [PATCH] make CONNECT's finding Java and JNI less verbose --- cmake/FindJNI.cmake | 8 ++++++++ cmake/FindJava.cmake | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 cmake/FindJNI.cmake create mode 100644 cmake/FindJava.cmake diff --git a/cmake/FindJNI.cmake b/cmake/FindJNI.cmake new file mode 100644 index 00000000000..3db9198d9c8 --- /dev/null +++ b/cmake/FindJNI.cmake @@ -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}) diff --git a/cmake/FindJava.cmake b/cmake/FindJava.cmake new file mode 100644 index 00000000000..95bbf8682cd --- /dev/null +++ b/cmake/FindJava.cmake @@ -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})