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

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

Revision: 12673
          http://sourceforge.net/p/plplot/code/12673
Author:   airwin
Date:     2013-11-09 19:59:07 +0000 (Sat, 09 Nov 2013)
Log Message:
-----------
Add generic/itkDecls.h to the list of itk4.0.0 headers that must be
installed. This patch has been publicly distributed at
https://sourceforge.net/p/incrtcl/patches/53/

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

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

Modified: trunk/cmake/build_projects/itk/bp.cmake
===================================================================
--- trunk/cmake/build_projects/itk/bp.cmake	2013-11-09 02:31:53 UTC (rev 12672)
+++ trunk/cmake/build_projects/itk/bp.cmake	2013-11-09 19:59:07 UTC (rev 12673)
@@ -85,9 +85,7 @@
   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
+  PATCH_COMMAND ""
   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
@@ -95,6 +93,20 @@
 
 add_custom_command(
   OUTPUT
+  ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-patch
+  COMMAND ${CMAKE_COMMAND} -E echo 
+  "Provide an exactly equivalent \"Itk\" and \"itk\" form of the package name to follow what is implemented for itcl version 4."
+  # This patch has been publicly distributed at https://sourceforge.net/p/incrtcl/patches/52/
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EP_BASE}/Source/build_${BP_PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/itk4_case.patch
+  COMMAND ${CMAKE_COMMAND} -E echo
+  "Add generic/itkDecls.h to the list of itk headers that must be installed."
+  # This patch has been publicly distributed at https://sourceforge.net/p/incrtcl/patches/53/
+  COMMAND ${PATCH_EXECUTABLE} --directory=${EP_BASE}/Source/build_${BP_PACKAGE} -p1 < ${CMAKE_SOURCE_DIR}/${BP_PACKAGE}/itk4_header_list.patch
+  APPEND
+  )
+
+add_custom_command(
+  OUTPUT
   ${EP_BASE}/Stamp/build_${BP_PACKAGE}/build_${BP_PACKAGE}-build
   COMMAND echo "Replace build-tree locations by install-tree locations"
   COMMAND ${SED_EXECUTABLE}

Added: trunk/cmake/build_projects/itk/itk4_header_list.patch
===================================================================
--- trunk/cmake/build_projects/itk/itk4_header_list.patch	                        (rev 0)
+++ trunk/cmake/build_projects/itk/itk4_header_list.patch	2013-11-09 19:59:07 UTC (rev 12673)
@@ -0,0 +1,24 @@
+diff -Naur itk4.0.0_orig/configure itk4.0.0/configure
+--- itk4.0.0_orig/configure	2013-02-03 08:25:51.000000000 -0800
++++ itk4.0.0/configure	2013-11-09 11:03:37.185416415 -0800
+@@ -5283,7 +5283,7 @@
+ 
+ 
+ 
+-    vars="generic/itk.h generic/itkInt.h"
++    vars="generic/itk.h generic/itkInt.h generic/itkDecls.h"
+     for i in $vars; do
+ 	# check for existence, be strict because it is installed
+ 	if test ! -f "${srcdir}/$i" ; then
+diff -Naur itk4.0.0_orig/configure.in itk4.0.0/configure.in
+--- itk4.0.0_orig/configure.in	2013-02-03 08:25:51.000000000 -0800
++++ itk4.0.0/configure.in	2013-11-09 11:03:11.281906189 -0800
+@@ -87,7 +87,7 @@
+ 	        itkUtil.c
+                 itkStubInit.c
+                 ])
+-TEA_ADD_HEADERS([generic/itk.h generic/itkInt.h])
++TEA_ADD_HEADERS([generic/itk.h generic/itkInt.h generic/itkDecls.h])
+ TEA_ADD_INCLUDES([${ITCL_INCLUDES} -I\"`${CYGPATH} ${srcdir}/generic`\"])
+ TEA_ADD_LIBS([])
+ TEA_ADD_CFLAGS([])

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