diff options
| author | Brad King <brad.king@kitware.com> | 2020-12-11 15:39:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-12-11 15:39:14 (GMT) |
| commit | 3765a415dfd4c521b4e656412503cbe1051a4c0b (patch) | |
| tree | a29565d1f4efd97306d2f23684b04e9a659bb2fc /Modules/FindJava.cmake | |
| parent | ff4d1d44f217bcbd90ba97f0fc41806cccb34e57 (diff) | |
| parent | adc6a4c5402658b8218a591639b652604893b919 (diff) | |
| download | CMake-3765a415dfd4c521b4e656412503cbe1051a4c0b.zip CMake-3765a415dfd4c521b4e656412503cbe1051a4c0b.tar.gz CMake-3765a415dfd4c521b4e656412503cbe1051a4c0b.tar.bz2 | |
Merge branch 'master' into doc-3_19_release-fixes
Diffstat (limited to 'Modules/FindJava.cmake')
| -rw-r--r-- | Modules/FindJava.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 9db740b..4f0e0fe 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -13,6 +13,9 @@ to specify a Java installation prefix explicitly. See also the :module:`FindJNI` module to find Java Native Interface (JNI). +.. versionadded:: 3.10 + Added support for Java 9+ version parsing. + Specify one or more of the following components as you call this find module. See example below. :: @@ -41,7 +44,9 @@ This module sets the following result variables: Java_VERSION_TWEAK = The tweak version of the package found (after '_') Java_VERSION = This is set to: $major[.$minor[.$patch[.$tweak]]] - +.. versionadded:: 3.4 + Added the ``Java_IDLJ_EXECUTABLE`` and ``Java_JARSIGNER_EXECUTABLE`` + variables. The minimum required version of Java can be specified using the :command:`find_package` syntax, e.g. |