summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Wasserbäch <debian@carbon-project.org>2010-12-09 16:31:00 (GMT)
committerBrad King <brad.king@kitware.com>2010-12-09 16:31:00 (GMT)
commitd95913e232af7ada3ee6f60487ebbdee91741e01 (patch)
treeb7e108b3e17e297e5030030b720fecccc34f7714
parentd25638ac0519fde108a8743ca0a8831d8512af5e (diff)
downloadCMake-d95913e232af7ada3ee6f60487ebbdee91741e01.zip
CMake-d95913e232af7ada3ee6f60487ebbdee91741e01.tar.gz
CMake-d95913e232af7ada3ee6f60487ebbdee91741e01.tar.bz2
FindTCL: Fix TCL and TK version variable references (#11528)
FindTCL.cmake switched variables in the FIND_LIBRARY invocation. The FIND_LIBRARY() statement for TCL used the TK variables and vice versa. This patch reverses that into the right usage. Closes debian issue 600245.
-rw-r--r--Modules/FindTCL.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindTCL.cmake b/Modules/FindTCL.cmake
index 8d780c1..8cfd9ca 100644
--- a/Modules/FindTCL.cmake
+++ b/Modules/FindTCL.cmake
@@ -104,7 +104,7 @@ ENDIF(WIN32)
FIND_LIBRARY(TCL_LIBRARY
NAMES
tcl
- tcl${TK_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
+ tcl${TCL_LIBRARY_VERSION} tcl${TCL_TCLSH_VERSION} tcl${TK_WISH_VERSION}
tcl86 tcl8.6
tcl85 tcl8.5
tcl84 tcl8.4
@@ -117,7 +117,7 @@ FIND_LIBRARY(TCL_LIBRARY
FIND_LIBRARY(TK_LIBRARY
NAMES
tk
- tk${TCL_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
+ tk${TK_LIBRARY_VERSION} tk${TCL_TCLSH_VERSION} tk${TK_WISH_VERSION}
tk86 tk8.6
tk85 tk8.5
tk84 tk8.4