diff options
| author | Brad King <brad.king@kitware.com> | 2014-11-06 19:48:45 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-11-06 19:52:49 (GMT) |
| commit | 67c4be51a34f86d4c26fa9f1f2f79f5539493eee (patch) | |
| tree | e44eefd24b5b5b6931c3783b911e62e5be77f9af /Modules/FindJava.cmake | |
| parent | 917da5d02766e875ec63eca09eb52b789114674c (diff) | |
| parent | 79349ed8fc22f70de7f839b2323cf3e93aca9bc9 (diff) | |
| download | CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.zip CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.gz CMake-67c4be51a34f86d4c26fa9f1f2f79f5539493eee.tar.bz2 | |
Merge branch 'release-doc-formatting' into doc-formatting
Resolve conflict in Modules/ExternalProject.cmake by keeping our side,
which is more completely revised.
Diffstat (limited to 'Modules/FindJava.cmake')
| -rw-r--r-- | Modules/FindJava.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index 0bd7eb0..79be34e 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -17,7 +17,7 @@ # Java_JAVAH_EXECUTABLE = the full path to the Java header generator # Java_JAVADOC_EXECUTABLE = the full path to the Java documention generator # Java_JAR_EXECUTABLE = the full path to the Java archiver -# Java_VERSION_STRING = Version of the package found (java version), eg. 1.6.0_12 +# Java_VERSION_STRING = Version of java found, eg. 1.6.0_12 # Java_VERSION_MAJOR = The major version of the package found. # Java_VERSION_MINOR = The minor version of the package found. # Java_VERSION_PATCH = The patch version of the package found. |