From f9f8cae9fe22c133f8c92e395ff70c42e287a2f7 Mon Sep 17 00:00:00 2001
From: Sergei Golubchik <serg@mariadb.org>
Date: Fri, 14 May 2021 19:55:53 +0200
Subject: [PATCH] cmake: fix FindJava/FindJNI wrappers for cmake re-runs

when cmake is re-run and include(FindJAVA) is skipped,
JAVA_FOUND should still be set. Same for JNI.
---
 cmake/FindJNI.cmake  | 5 +++++
 cmake/FindJava.cmake | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/cmake/FindJNI.cmake b/cmake/FindJNI.cmake
index fb2f4801a70..12305d7c86d 100644
--- a/cmake/FindJNI.cmake
+++ b/cmake/FindJNI.cmake
@@ -1,4 +1,9 @@
+if(JAVA_AWT_LIBRARY)
+  set(JNI_FOUND TRUE)
+  return()
+endif()
 if(DEFINED JAVA_AWT_LIBRARY)
+  set(JNI_FOUND FALSE)
   return()
 endif()
 
diff --git a/cmake/FindJava.cmake b/cmake/FindJava.cmake
index 95bbf8682cd..714f56b1f72 100644
--- a/cmake/FindJava.cmake
+++ b/cmake/FindJava.cmake
@@ -1,4 +1,9 @@
+if(Java_JAVA_EXECUTABLE)
+  set(JAVA_FOUND TRUE)
+  return()
+endif()
 if(DEFINED Java_JAVA_EXECUTABLE)
+  set(JAVA_FOUND FALSE)
   return()
 endif()