diff options
| author | Brad King <brad.king@kitware.com> | 2018-02-28 13:16:22 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-02-28 13:16:52 (GMT) |
| commit | 74dac86c7625b1c33ccc564155a7f8982f1ce67f (patch) | |
| tree | 1b91e6bce85984953aa03920ae25327b86219e9e /Modules | |
| parent | 514e845f4eea3322d13836c2e83ea9999fb79987 (diff) | |
| parent | 596a7f262aa9dd505e4b8f3c3da22e265e38b0ed (diff) | |
| download | CMake-74dac86c7625b1c33ccc564155a7f8982f1ce67f.zip CMake-74dac86c7625b1c33ccc564155a7f8982f1ce67f.tar.gz CMake-74dac86c7625b1c33ccc564155a7f8982f1ce67f.tar.bz2 | |
Merge topic 'findjava-jar-in-dev-component'
596a7f262a FindJava: Add Java_JAR_EXECUTABLE to a component: Development
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1807
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindJava.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index e3f5af6..c56c197 100644 --- a/Modules/FindJava.cmake +++ b/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() |