[Cmake-commits] CMake branch, next, updated. v2.8.3-784-gdce9799

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  dce97990d97e72766e516b7572d6fabe659d176b (commit)
       via  d95913e232af7ada3ee6f60487ebbdee91741e01 (commit)
      from  54fe3cfdb79209b69fe45e7eb038e531212353a2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dce97990d97e72766e516b7572d6fabe659d176b
commit dce97990d97e72766e516b7572d6fabe659d176b
Merge: 54fe3cf d95913e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Dec 9 11:32:21 2010 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 9 11:32:21 2010 -0500

    Merge topic 'FindTCL-version-ref' into next
    
    d95913e FindTCL: Fix TCL and TK version variable references (#11528)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d95913e232af7ada3ee6f60487ebbdee91741e01
commit d95913e232af7ada3ee6f60487ebbdee91741e01
Author:     Kai Wasserbäch <debian at carbon-project.org>
AuthorDate: Thu Dec 9 11:31:00 2010 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Dec 9 11:31:00 2010 -0500

    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.

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 

-----------------------------------------------------------------------

Summary of changes:
 Modules/FindTCL.cmake |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake