[cmake-commits] barre committed FindTCL.cmake 1.50 1.51
FindTclsh.cmake 1.19 1.20 FindWish.cmake 1.13 1.14
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Jan 24 19:31:26 EST 2008
Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv20057/Modules
Modified Files:
FindTCL.cmake FindTclsh.cmake FindWish.cmake
Log Message:
ENH: update for Tcl/Tk 8.5
Index: FindTCL.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTCL.cmake,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- FindTCL.cmake 23 Jan 2008 21:27:36 -0000 1.50
+++ FindTCL.cmake 25 Jan 2008 00:31:24 -0000 1.51
@@ -125,6 +125,8 @@
"${TK_LIBRARY_PATH_PARENT}/include"
"${TCL_INCLUDE_PATH}"
"${TK_INCLUDE_PATH}"
+ ${TCL_FRAMEWORK_INCLUDES}
+ ${TK_FRAMEWORK_INCLUDES}
"${TCL_TCLSH_PATH_PARENT}/include"
"${TK_WISH_PATH_PARENT}/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/include"
@@ -148,11 +150,17 @@
)
FIND_PATH(TCL_INCLUDE_PATH tcl.h
- ${TCL_FRAMEWORK_INCLUDES} ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
+)
+FIND_PATH(TCL_INCLUDE_PATH tcl.h
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
FIND_PATH(TK_INCLUDE_PATH tk.h
- ${TK_FRAMEWORK_INCLUDES} ${TCLTK_POSSIBLE_INCLUDE_PATHS}
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS} NO_DEFAULT_PATH
+)
+FIND_PATH(TK_INCLUDE_PATH tk.h
+ ${TCLTK_POSSIBLE_INCLUDE_PATHS}
)
# handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if
Index: FindWish.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindWish.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- FindWish.cmake 23 Jan 2008 21:27:36 -0000 1.13
+++ FindWish.cmake 25 Jan 2008 00:31:24 -0000 1.14
@@ -42,14 +42,22 @@
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
)
-FIND_PROGRAM(TK_WISH
- NAMES wish
+SET(TK_WISH_NAMES
+ wish
wish86 wish8.6
wish85 wish8.5
wish84 wish8.4
wish83 wish8.3
wish82 wish8.2
wish80 wish8.0
+)
+
+FIND_PROGRAM(TK_WISH
+ NAMES ${TK_WISH_NAMES}
+ PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
+)
+FIND_PROGRAM(TK_WISH
+ NAMES ${TK_WISH_NAMES}
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
)
Index: FindTclsh.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindTclsh.cmake,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- FindTclsh.cmake 23 Jan 2008 21:27:36 -0000 1.19
+++ FindTclsh.cmake 25 Jan 2008 00:31:24 -0000 1.20
@@ -43,14 +43,22 @@
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
)
-FIND_PROGRAM(TCL_TCLSH
- NAMES tclsh
+SET(TCL_TCLSH_NAMES
+ tclsh
tclsh86 tclsh8.6
tclsh85 tclsh8.5
tclsh84 tclsh8.4
tclsh83 tclsh8.3
tclsh82 tclsh8.2
tclsh80 tclsh8.0
+)
+
+FIND_PROGRAM(TCL_TCLSH
+ NAMES ${TCL_TCLSH_NAMES}
+ PATHS ${TCLTK_POSSIBLE_BIN_PATHS} NO_DEFAULT_PATH
+)
+FIND_PROGRAM(TCL_TCLSH
+ NAMES ${TCL_TCLSH_NAME}
PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
)
More information about the Cmake-commits
mailing list