[Plplot-cvs] SF.net SVN: plplot:[12669] trunk/cmake/build_projects/itk

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

Revision: 12669
          http://sourceforge.net/p/plplot/code/12669
Author:   airwin
Date:     2013-11-08 07:27:59 +0000 (Fri, 08 Nov 2013)
Log Message:
-----------
Implement and use a small patch to itk version 4 so that both the Itk and itk
package names can be used.  The file itk4_case.patch has also been
made publicly available at https://sourceforge.net/p/incrtcl/patches/52

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

Added Paths:
-----------
    trunk/cmake/build_projects/itk/itk4_case.patch

Modified: trunk/cmake/build_projects/itk/bp.cmake
===================================================================
--- trunk/cmake/build_projects/itk/bp.cmake	2013-11-08 07:23:20 UTC (rev 12668)
+++ trunk/cmake/build_projects/itk/bp.cmake	2013-11-08 07:27:59 UTC (rev 12669)
@@ -85,6 +85,9 @@
   DEPENDS ${${BP_PACKAGE}_dependencies_targets}
   URL ${${BP_PACKAGE}_URL}
   URL_HASH ${${BP_PACKAGE}_DOWNLOAD_HASH_TYPE}=${${BP_PACKAGE}_DOWNLOAD_HASH}
+  # Provide an exactly equivalent "Itk" and "itk" form of the package name to
+  # follow what is implemented for itcl version 4.
+  PATCH_COMMAND ${PATCH_EXECUTABLE} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/itk4_case.patch
   CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${${BP_PACKAGE}_SET_CFLAGS} CPPFLAGS=-I${BP_CMAKE_INSTALL_PREFIX}/include ${source_PATH}/${BP_CONFIGURE_COMMAND} --mandir=${BP_CMAKE_INSTALL_PREFIX}/share/man ${ITK_ENABLE_64_BIT} --with-itcl=${BP_CMAKE_INSTALL_PREFIX}/lib/itcl${ITCL_ITK_LIBVERSION}
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${BP_PATH} ${BP_PARALLEL_MAKE_COMMAND} install

Added: trunk/cmake/build_projects/itk/itk4_case.patch
===================================================================
--- trunk/cmake/build_projects/itk/itk4_case.patch	                        (rev 0)
+++ trunk/cmake/build_projects/itk/itk4_case.patch	2013-11-08 07:27:59 UTC (rev 12669)
@@ -0,0 +1,20 @@
+diff -Naur itk4.0.0_orig/generic/itkBase.c itk4.0.0/generic/itkBase.c
+--- itk4.0.0_orig/generic/itkBase.c	2013-02-03 08:25:51.000000000 -0800
++++ itk4.0.0/generic/itkBase.c	2013-11-07 14:18:15.711783872 -0800
+@@ -231,6 +231,8 @@
+      *  end-of-the-line?
+      */
+ 
++    Tcl_PkgProvideEx(interp, "Itk", ITK_PATCH_LEVEL,
++            (ClientData) &itkStubs);
+     return Tcl_PkgProvideEx(interp, "itk", ITK_PATCH_LEVEL,
+             (ClientData) &itkStubs);
+ }
+diff -Naur itk4.0.0_orig/pkgIndex.tcl.in itk4.0.0/pkgIndex.tcl.in
+--- itk4.0.0_orig/pkgIndex.tcl.in	2013-02-03 08:25:51.000000000 -0800
++++ itk4.0.0/pkgIndex.tcl.in	2013-11-07 14:16:18.585957142 -0800
+@@ -1,3 +1,4 @@
+ # Tcl package index file, version 1.0
+ 
+ package ifneeded itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] itk]
++package ifneeded Itk @PACKAGE_VERSION@ [list load [file join $dir "@PKG_LIB_FILE@"] itk]

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