diff options
| author | Sebastien Barre <sebastien.barre@kitware.com> | 2003-10-16 15:05:04 (GMT) |
|---|---|---|
| committer | Sebastien Barre <sebastien.barre@kitware.com> | 2003-10-16 15:05:04 (GMT) |
| commit | 296e73180844791bf1a8ec51dad489625ca8c9f3 (patch) | |
| tree | fc24b1bcd18952596ac4b686b14b5c6e0a846a3d /Modules/FindJNI.cmake | |
| parent | 4d2ca08bc7a91fcc207ec481323796acdf68eec6 (diff) | |
| download | CMake-296e73180844791bf1a8ec51dad489625ca8c9f3.zip CMake-296e73180844791bf1a8ec51dad489625ca8c9f3.tar.gz CMake-296e73180844791bf1a8ec51dad489625ca8c9f3.tar.bz2 | |
FIX: for Windows users, it seems logical to favor native win32 installation before Cygwin ones. Otherwise you can end up with bad mixes (part of the java tools were picked from the SDK, part from Cygwin)
Diffstat (limited to 'Modules/FindJNI.cmake')
| -rw-r--r-- | Modules/FindJNI.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index e708844..a8dd17e 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -9,21 +9,21 @@ # SET(JAVA_AWT_LIBRARY_DIRECTORIES + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib" /usr/lib /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" ) SET(JAVA_AWT_INCLUDE_DIRECTORIES + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" /usr/include /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" ) IF(APPLE) |