diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-14 14:38:45 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2002-11-14 14:38:45 (GMT) |
| commit | 2281726935b1a0821bb14dcc96ed99ac9c415845 (patch) | |
| tree | ff3f46b54db734e86744ebc041c70af1b185e311 /Modules/FindJNI.cmake | |
| parent | b7f96d0e7505f246cee64017e1460e039c714f01 (diff) | |
| download | CMake-2281726935b1a0821bb14dcc96ed99ac9c415845.zip CMake-2281726935b1a0821bb14dcc96ed99ac9c415845.tar.gz CMake-2281726935b1a0821bb14dcc96ed99ac9c415845.tar.bz2 | |
Clean find for Python, add find for python 2.2 on windows, cleanup java on windows and add java 1.4 support
Diffstat (limited to 'Modules/FindJNI.cmake')
| -rw-r--r-- | Modules/FindJNI.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 3beb790..293de87 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -13,6 +13,7 @@ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt /usr/local/lib /usr/lib/java/jre/lib/i386 /usr/local/lib/java/jre/lib/i386 + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib" ) @@ -22,6 +23,7 @@ FIND_PATH(JAVA_INCLUDE_PATH jni.h /usr/local/include /usr/lib/java/include /usr/local/lib/java/include + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" ) |