cmake: fix FindJava/FindJNI wrappers for cmake re-runs

vuvova · vuvova · commit f9f8cae9fe22 · 2021-05-22T21:56:51.000+02:00
when cmake is re-run and include(FindJAVA) is skipped,
JAVA_FOUND should still be set. Same for JNI.
diff --git 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
@@ -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()
 
