diff options
| author | Brad King <brad.king@kitware.com> | 2015-05-14 14:27:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-05-14 14:27:40 (GMT) |
| commit | eb9323eb1aa2beb32d933c3e09a160939ff31682 (patch) | |
| tree | 98b712a36e1581eef393493ec8f877bce6f6d2a0 | |
| parent | ee58e94d62e33a06625f09b6a89ff3bbdeaf510e (diff) | |
| parent | 7953867ba46223dfab373ce58cff0a4bc20c3864 (diff) | |
| download | CMake-eb9323eb1aa2beb32d933c3e09a160939ff31682.zip CMake-eb9323eb1aa2beb32d933c3e09a160939ff31682.tar.gz CMake-eb9323eb1aa2beb32d933c3e09a160939ff31682.tar.bz2 | |
Merge topic 'FindJava-openjdk-8'
7953867b FindJava: Fix OpenJDK 8 version detection (#15565)
| -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 bb73853..9e43174 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -137,7 +137,7 @@ if(Java_JAVA_EXECUTABLE) elseif(var MATCHES "java full version \"kaffe-([0-9]+\\.[0-9]+\\.[0-9_]+)\"") # Kaffe style set(Java_VERSION_STRING "${CMAKE_MATCH_1}") - elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+)\"") + elseif(var MATCHES "openjdk version \"([0-9]+\\.[0-9]+\\.[0-9_]+.*)\"") # OpenJDK ver 1.7.x on OpenBSD set(Java_VERSION_STRING "${CMAKE_MATCH_1}") else() |