diff options
| author | Ken Martin <ken.martin@kitware.com> | 2001-06-06 13:43:54 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2001-06-06 13:43:54 (GMT) |
| commit | d84a68d06711ed7cb519bbd99bb5b2cfa3de3f0e (patch) | |
| tree | f21762419bae8ddd64a9c000a5fec45fa087249f | |
| parent | 0f0f55fee4f66c3665ad902cbda3c296fc1e6d75 (diff) | |
| download | CMake-d84a68d06711ed7cb519bbd99bb5b2cfa3de3f0e.zip CMake-d84a68d06711ed7cb519bbd99bb5b2cfa3de3f0e.tar.gz CMake-d84a68d06711ed7cb519bbd99bb5b2cfa3de3f0e.tar.bz2 | |
better tests
| -rw-r--r-- | Modules/FindJNI.cmake | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index a809b8f..c75d60e 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -8,14 +8,23 @@ # JAVA_AWT_INCLUDE_PATH = the path to where jni.h can be found # -FIND_LIBRARY(JAVA_AWT_LIBRARY jawt PATHS /usr/lib /usr/local/lib) +FIND_LIBRARY(JAVA_AWT_LIBRARY jawt + PATHS /usr/lib /usr/local/lib + "[HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\1.3;JavaHome]/lib" +) # add in the include path -FIND_PATH(JAVA_INCLUDE_PATH jni.h /usr/include /usr/local/include) +FIND_PATH(JAVA_INCLUDE_PATH jni.h + /usr/include + /usr/local/include + "[HKEY_LOCAL_MACHINE\SOFTWARE\JavaSoft\Java Development Kit\1.3;JavaHome]/include" +) + FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h ${JAVA_INCLUDE_PATH}/win32 ${JAVA_INCLUDE_PATH}/linux ) -FIND_PATH(JAVE_AWT_INCLUDE_PATH jawt.h /usr/include /usr/local/include) + +FIND_PATH(JAVE_AWT_INCLUDE_PATH jawt.h ${JAVA_INCLUDE_PATH} ) |