summaryrefslogtreecommitdiffstats
path: root/Modules/FindWish.cmake
diff options
context:
space:
mode:
authorSebastien Barre <sebastien.barre@kitware.com>2008-01-25 18:07:59 (GMT)
committerSebastien Barre <sebastien.barre@kitware.com>2008-01-25 18:07:59 (GMT)
commitbd28610ec347b5d302f708ad5b66409fe350340b (patch)
tree1afd7f5f4ef888326c2cffd1fc40a34795dae36f /Modules/FindWish.cmake
parent386a6ebf251f45123ca542bef8f4050fd5f37522 (diff)
downloadCMake-bd28610ec347b5d302f708ad5b66409fe350340b.zip
CMake-bd28610ec347b5d302f708ad5b66409fe350340b.tar.gz
CMake-bd28610ec347b5d302f708ad5b66409fe350340b.tar.bz2
ENH: update for Tcl/Tk 8.5
Diffstat (limited to 'Modules/FindWish.cmake')
-rw-r--r--Modules/FindWish.cmake36
1 files changed, 20 insertions, 16 deletions
diff --git a/Modules/FindWish.cmake b/Modules/FindWish.cmake
index ce17aec..4bafe76 100644
--- a/Modules/FindWish.cmake
+++ b/Modules/FindWish.cmake
@@ -22,25 +22,29 @@ GET_FILENAME_COMPONENT(TCL_LIBRARY_PATH_PARENT "${TCL_LIBRARY_PATH}" PATH)
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH "${TK_LIBRARY}" PATH)
GET_FILENAME_COMPONENT(TK_LIBRARY_PATH_PARENT "${TK_LIBRARY_PATH}" PATH)
-GET_FILENAME_COMPONENT(
- ActiveTcl_CurrentVersion
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
- NAME)
-
SET(TCLTK_POSSIBLE_BIN_PATHS
"${TCL_INCLUDE_PATH_PARENT}/bin"
"${TK_INCLUDE_PATH_PARENT}/bin"
"${TCL_LIBRARY_PATH_PARENT}/bin"
"${TK_LIBRARY_PATH_PARENT}/bin"
"${TCL_TCLSH_PATH_PARENT}/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/bin"
- "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
-)
+ )
+
+IF(WIN32)
+ GET_FILENAME_COMPONENT(
+ ActiveTcl_CurrentVersion
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl;CurrentVersion]"
+ NAME)
+ SET(TCLTK_POSSIBLE_BIN_PATHS ${TCLTK_POSSIBLE_BIN_PATHS}
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\ActiveState\\ActiveTcl\\${ActiveTcl_CurrentVersion}]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.6;Root]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.5;Root]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.4;Root]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.3;Root]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.2;Root]/bin"
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Scriptics\\Tcl\\8.0;Root]/bin"
+ )
+ENDIF(WIN32)
SET(TK_WISH_NAMES
wish
@@ -50,15 +54,15 @@ SET(TK_WISH_NAMES
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}
-)
+ )
MARK_AS_ADVANCED(TK_WISH)