diff options
| -rw-r--r-- | Modules/FindJava.cmake | 2 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 |
2 files changed, 2 insertions, 2 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() diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index cf7a523..73cda83 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 2) -set(CMake_VERSION_PATCH 20150512) +set(CMake_VERSION_PATCH 20150514) #set(CMake_VERSION_RC 1) |