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 | |
| 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')
| -rw-r--r-- | Modules/CMakeDetermineJavaCompiler.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindJNI.cmake | 8 | ||||
| -rw-r--r-- | Modules/FindJava.cmake | 4 | ||||
| -rw-r--r-- | Modules/FindTCL.cmake | 16 |
4 files changed, 16 insertions, 16 deletions
diff --git a/Modules/CMakeDetermineJavaCompiler.cmake b/Modules/CMakeDetermineJavaCompiler.cmake index 2e556e4..91a44e7 100644 --- a/Modules/CMakeDetermineJavaCompiler.cmake +++ b/Modules/CMakeDetermineJavaCompiler.cmake @@ -29,13 +29,13 @@ IF(NOT CMAKE_JAVA_COMPILER) ENDIF($ENV{JAVA_ARCHIVE} MATCHES ".+") SET(JAVA_BIN_PATH + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" /usr/bin /usr/lib/java/bin /usr/share/java/bin /usr/local/bin /usr/local/java/bin - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" ) # if no compiler has been specified yet, then look for one IF(CMAKE_JAVA_COMPILER_INIT) 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) diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake index baf6b30..25ab1e1 100644 --- a/Modules/FindJava.cmake +++ b/Modules/FindJava.cmake @@ -9,13 +9,13 @@ # SET(JAVA_BIN_PATH + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" /usr/bin /usr/lib/java/bin /usr/share/java/bin /usr/local/bin /usr/local/java/bin - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin" - "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin" ) FIND_PROGRAM(JAVA_RUNTIME NAMES java diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake index 23c2f83..0b95c6b 100644 --- a/Modules/FindTCL.cmake +++ b/Modules/FindTCL.cmake @@ -28,14 +28,14 @@ GET_FILENAME_COMPONENT(TK_WISH_PATH ${TK_WISH} PATH) SET (TCLTK_POSSIBLE_LIB_PATHS "${TCL_TCLSH_PATH}/../lib" "${TK_WISH_PATH}/../lib" - /usr/lib - /usr/local/lib "C:/Program Files/Tcl/lib" "C:/Tcl/lib" [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/lib [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/lib [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/lib [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/lib + /usr/lib + /usr/local/lib ) FIND_LIBRARY(TCL_LIBRARY @@ -87,18 +87,18 @@ SET (TCLTK_POSSIBLE_INCLUDE_PATHS /Library/Frameworks/Tk.framework/PrivateHeaders "${TCL_TCLSH_PATH}/../include" "${TK_WISH_PATH}/../include" - /usr/include - /usr/local/include - /usr/include/tcl8.4 - /usr/include/tcl8.3 - /usr/include/tcl8.2 - /usr/include/tcl8.0 "C:/Program Files/Tcl/include" "C:/Tcl/include" [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/include [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/include [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/include [HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/include + /usr/include + /usr/local/include + /usr/include/tcl8.4 + /usr/include/tcl8.3 + /usr/include/tcl8.2 + /usr/include/tcl8.0 ) FIND_PATH(TCL_INCLUDE_PATH tcl.h |