[Plplot-cvs] SF.net SVN: plplot:[12664] trunk/cmake/modules/tcl-related.cmake

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

Revision: 12664
          http://sourceforge.net/p/plplot/code/12664
Author:   airwin
Date:     2013-11-06 00:35:15 +0000 (Wed, 06 Nov 2013)
Log Message:
-----------
Implement USE_INCRTCL_VERSION_4 option which allows users to express a
preference for version 4 of itcl and friends of both version 3 and
version 4 are available.  This option is OFF by default (i.e., the
default preference is version 3 of itcl and friends when both version
3 and 4 are available).

Modified Paths:
--------------
    trunk/cmake/modules/tcl-related.cmake

Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake	2013-11-05 20:25:06 UTC (rev 12663)
+++ trunk/cmake/modules/tcl-related.cmake	2013-11-06 00:35:15 UTC (rev 12664)
@@ -32,6 +32,8 @@
   option(ENABLE_itk "Enable incr TK interface code" ON)
 endif(DEFAULT_NO_BINDINGS)
 
+option(USE_INCRTCL_VERSION_4 "Use [incr Tcl] version 4" OFF)
+
 # Depending on these above options and system resources may also determine
 # the following variables which are largely self-explanatory unless documented
 # further.
@@ -94,7 +96,10 @@
           message(STATUS "Looking for itcl.h - found")
           message(STATUS "Looking for itcl library")
           get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
-          set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+          set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+	  if(USE_INCRTCL_VERSION_4)
+	    set(itcl_library_versions 4.0.0 ${itcl_library_versions})
+	  endif(USE_INCRTCL_VERSION_4)
           foreach(version ${itcl_library_versions})
             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
               PATH_SUFFIXES itcl${version})
@@ -161,7 +166,10 @@
       if(ITK_INCLUDE_PATH)
         message(STATUS "Looking for itk.h - found")
         message(STATUS "Looking for itk library")
-        set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+	if(USE_INCRTCL_VERSION_4)
+	  set(itk_library_versions 4.0.0 ${itk_library_versions})
+	endif(USE_INCRTCL_VERSION_4)
         foreach(version ${itk_library_versions})
           find_library(ITK_LIBRARY itk${version} PATHS ${TCL_LIBRARY_PATH}
             PATH_SUFFIXES itk${version})

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