49 lines
1.4 KiB
Plaintext
49 lines
1.4 KiB
Plaintext
$OpenBSD: patch-Modules_FindJava_cmake,v 1.15 2014/09/11 14:45:13 dcoppa Exp $
|
|
--- Modules/FindJava.cmake.orig Thu Jul 31 17:03:56 2014
|
|
+++ Modules/FindJava.cmake Wed Sep 3 08:10:09 2014
|
|
@@ -71,6 +71,8 @@
|
|
|
|
include(${CMAKE_CURRENT_LIST_DIR}/CMakeFindJavaCommon.cmake)
|
|
|
|
+set(MODJAVA_VER $ENV{MODJAVA_VER})
|
|
+
|
|
# The HINTS option should only be used for values computed from the system.
|
|
set(_JAVA_HINTS)
|
|
if(_JAVA_HOME)
|
|
@@ -88,19 +90,22 @@ list(APPEND _JAVA_HINTS
|
|
)
|
|
# Hard-coded guesses should still go in PATHS. This ensures that the user
|
|
# environment can always override hard guesses.
|
|
-set(_JAVA_PATHS
|
|
- /usr/lib/java/bin
|
|
- /usr/share/java/bin
|
|
- /usr/local/java/bin
|
|
- /usr/local/java/share/bin
|
|
- /usr/java/j2sdk1.4.2_04
|
|
- /usr/lib/j2sdk1.4-sun/bin
|
|
- /usr/java/j2sdk1.4.2_09/bin
|
|
- /usr/lib/j2sdk1.5-sun/bin
|
|
- /opt/sun-jdk-1.5.0.04/bin
|
|
- /usr/local/jdk-1.7.0/bin
|
|
- /usr/local/jdk-1.6.0/bin
|
|
- )
|
|
+if(MODJAVA_VER)
|
|
+ set(_JAVA_PATHS ${LOCALBASE}/jdk-1.7.0/bin)
|
|
+else()
|
|
+ set(_JAVA_PATHS
|
|
+ /usr/lib/java/bin
|
|
+ /usr/share/java/bin
|
|
+ /usr/local/java/bin
|
|
+ /usr/local/java/share/bin
|
|
+ /usr/java/j2sdk1.4.2_04
|
|
+ /usr/lib/j2sdk1.4-sun/bin
|
|
+ /usr/java/j2sdk1.4.2_09/bin
|
|
+ /usr/lib/j2sdk1.5-sun/bin
|
|
+ /opt/sun-jdk-1.5.0.04/bin
|
|
+ ${LOCALBASE}/jdk-1.7.0/bin
|
|
+ )
|
|
+endif()
|
|
find_program(Java_JAVA_EXECUTABLE
|
|
NAMES java
|
|
HINTS ${_JAVA_HINTS}
|