make CONNECT's finding Java and JNI less verbose

6152784c · Sergei Golubchik · 58f20b0c · 6152784c · 6152784c
Commit 6152784c authored Sep 05, 2016 by Sergei Golubchik
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 0 deletions

cmake/FindJNI.cmake cmake/FindJNI.cmake +8 -0

cmake/FindJava.cmake cmake/FindJava.cmake +8 -0

No files found.
--- a/cmake/FindJNI.cmake
+++ b/cmake/FindJNI.cmake
+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})
--- a/cmake/FindJava.cmake
+++ b/cmake/FindJava.cmake
+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})