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

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

Revision: 12638
          http://sourceforge.net/p/plplot/code/12638
Author:   airwin
Date:     2013-10-28 22:05:41 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
Warn if Tcl/Tk library locations are different.

Add 4.0.0 to the list of possible itk versions.

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

Modified: trunk/cmake/modules/tcl-related.cmake
===================================================================
--- trunk/cmake/modules/tcl-related.cmake	2013-10-26 21:18:55 UTC (rev 12637)
+++ trunk/cmake/modules/tcl-related.cmake	2013-10-28 22:05:41 UTC (rev 12638)
@@ -85,15 +85,15 @@
 	OUTPUT_VARIABLE AVAILABLE_ITCL)
       if(AVAILABLE_ITCL)
         execute_process(
-	COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
-	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
-	OUTPUT_VARIABLE itcl_library_versions)
+	  COMMAND ${TCL_TCLSH} GetITCL_Version.tcl
+	  WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules
+	  OUTPUT_VARIABLE itcl_library_versions)
         message(STATUS "Looking for itcl.h")
         find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH})
         if(ITCL_INCLUDE_PATH)
           message(STATUS "Looking for itcl.h - found")
           message(STATUS "Looking for itcl library")
-	get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH)
+          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)
           foreach(version ${itcl_library_versions})
             find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH}
@@ -132,13 +132,21 @@
     else(ENABLE_itcl)
       set(MKTCLINDEX_ARGS "-tcl")
     endif(ENABLE_itcl)
+
     if(ENABLE_tk AND NOT X11_FOUND)
       message(STATUS "WARNING: X11 not found, disabling Tk interface code")
       set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE)
     endif(ENABLE_tk AND NOT X11_FOUND)
     if(ENABLE_tk)
+      get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH)
+      if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
+	message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}")
+	message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}")
+	message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible")
+      endif(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH})
+    endif(ENABLE_tk)
+    if(ENABLE_tk)
       set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR})
-      set(TK_LIBRARY ${TK_LIBRARY})
       message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}")
       message(STATUS "TK_LIBRARY = ${TK_LIBRARY}")
     else(ENABLE_tk)
@@ -153,9 +161,9 @@
       if(ITK_INCLUDE_PATH)
         message(STATUS "Looking for itk.h - found")
         message(STATUS "Looking for itk library")
-        set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
+        set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0)
         foreach(version ${itk_library_versions})
-          find_library(ITK_LIBRARY itk${version}
+          find_library(ITK_LIBRARY itk${version} PATHS ${TCL_LIBRARY_PATH}
             PATH_SUFFIXES itk${version})
         endforeach(version ${itk_library_versions})
         if(ITK_LIBRARY)

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