Merge topic 'findjava-jar-in-dev-component'

596a7f262a FindJava: Add Java_JAR_EXECUTABLE to a component: Development

Acked-by: Kitware Robot <[email protected]>
Merge-request: !1807

Modules/FindJava.cmake

@@ -18,7 +18,7 @@
 # ::
 #
 #   Runtime     = User just want to execute some Java byte-compiled
-#   Development = Development tools (java, javac, javah and javadoc), includes Runtime component
+#   Development = Development tools (java, javac, javah, jar and javadoc), includes Runtime component
 #   IdlJ        = idl compiler for Java
 #   JarSigner   = signer tool for jar
 #
@@ -237,16 +237,16 @@ if(Java_FIND_COMPONENTS)
       endif()
     elseif(component STREQUAL "Development")
       list(APPEND _JAVA_REQUIRED_VARS Java_JAVA_EXECUTABLE Java_JAVAC_EXECUTABLE
-                                      Java_JAVADOC_EXECUTABLE)
+                                      Java_JAR_EXECUTABLE Java_JAVADOC_EXECUTABLE)
       if(Java_VERSION VERSION_LESS "1.10")
         list(APPEND _JAVA_REQUIRED_VARS Java_JAVAH_EXECUTABLE)
         if(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE
-            AND Java_JAVAH_EXECUTABLE AND Java_JAVADOC_EXECUTABLE)
+            AND Java_JAVAH_EXECUTABLE AND Java_JAR_EXECUTABLE AND Java_JAVADOC_EXECUTABLE)
           set(Java_Development_FOUND TRUE)
         endif()
       else()
         if(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE
-            AND Java_JAVADOC_EXECUTABLE)
+            AND Java_JAR_EXECUTABLE AND Java_JAVADOC_EXECUTABLE)
           set(Java_Development_FOUND TRUE)
         endif()
       endif()