[Plplot-cvs] SF.net SVN: plplot:[12633] trunk/cmake/build_projects/tcl/bp.cmake

[<ai...@us...>]

Revision: 12633
          http://sourceforge.net/p/plplot/code/12633
Author:   airwin
Date:     2013-10-26 18:41:13 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
Implement and use some useful convenience variables to keep track of
and enforce consistent version numbers for Tcl/Tk and iTcl/iTk.

Modified Paths:
--------------
    trunk/cmake/build_projects/tcl/bp.cmake

Modified: trunk/cmake/build_projects/tcl/bp.cmake
===================================================================
--- trunk/cmake/build_projects/tcl/bp.cmake	2013-10-26 06:41:06 UTC (rev 12632)
+++ trunk/cmake/build_projects/tcl/bp.cmake	2013-10-26 18:41:13 UTC (rev 12633)
@@ -55,8 +55,15 @@
 # This can be safely done only after above includes.
 set(BP_PACKAGE tcl)
 
+# These variables are also used by tk and itk (and accessible to those
+# build configurations because they both depend on this one in any case).
+set(TCL_TK_VERSION 8.6.1)
+string(REGEX REPLACE "\\.[0-9]$" "" TCL_TK_LIBVERSION ${TCL_TK_VERSION})
+set(ITCL_ITK_VERSION 4.0.0)
+set(ITCL_ITK_LIBVERSION ${ITCL_ITK_VERSION})
+
 # Data that is related to downloads.
-set(${BP_PACKAGE}_URL  http://downloads.sourceforge.net/tcl/tcl8.6.1-src.tar.gz)
+set(${BP_PACKAGE}_URL http://downloads.sourceforge.net/project/tcl/Tcl/${TCL_TK_VERSION}/tcl${TCL_TK_VERSION}-src.tar.gz)
 set(${BP_PACKAGE}_DOWNLOAD_HASH_TYPE MD5)
 set(${BP_PACKAGE}_DOWNLOAD_HASH aae4b701ee527c6e4e1a6f9c7399882e)
 
@@ -110,8 +117,8 @@
   ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-install
   COMMAND echo "Install-tree fixups"
   COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install-private-headers
-  COMMAND ${LN_EXECUTABLE} -v -sf tclsh8.6 ${BP_CMAKE_INSTALL_PREFIX}/bin/tclsh
-  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${BP_CMAKE_INSTALL_PREFIX}/lib/libtcl8.6.so
+  COMMAND ${LN_EXECUTABLE} -v -sf tclsh${TCL_TK_LIBVERSION} ${BP_CMAKE_INSTALL_PREFIX}/bin/tclsh
+  COMMAND ${CHMOD_EXECUTABLE} -v ${SO_NUMERICAL_PERMISSIONS} ${BP_CMAKE_INSTALL_PREFIX}/lib/libtcl${TCL_TK_LIBVERSION}.so
   APPEND
   )
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.