[med-svn] r22405 - in trunk/packages/insighttoolkit/trunk/debian: . patches

[Gert Wollny]

Author: gert-guest
Date: 2016-07-06 14:20:41 +0000 (Wed, 06 Jul 2016)
New Revision: 22405

Added:
   trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch
   trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch
Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/series
   trunk/packages/insighttoolkit/trunk/debian/rules
Log:
Add patches to correct compilation and enable system nifti 

* correct_itkMathDetail: correct inclusion order to handle 
  stricter lookup of declarations
* enable-system-nifti.patch: enable the use of system nifti


Added: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-correct_itkMathDetail_include-order.patch	2016-07-06 14:20:41 UTC (rev 22405)
@@ -0,0 +1,11 @@
+--- insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/Core/Common/include/itkMathDetail.h	2016-05-26 17:32:22.000000000 +0200
++++ insighttoolkit4-4.10.0/Modules/Core/Common/include/itkMathDetail.h	2016-07-06 15:58:30.820967520 +0200
+@@ -28,7 +28,7 @@
+ #ifndef itkMathDetail_h
+ #define itkMathDetail_h
+ 
+-#include "itkMath.h"
++//#include "itkMath.h"
+ #include "itkIntTypes.h"
+ #include "itkNumericTraits.h"
+ 

Added: trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch	                        (rev 0)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/itk4.10-enable-system-nifti.patch	2016-07-06 14:20:41 UTC (rev 22405)
@@ -0,0 +1,33 @@
+diff -ru insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt insighttoolkit4-4.10.0/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt
+--- insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt	2016-05-26 17:32:22.000000000 +0200
++++ insighttoolkit4-4.10.0/Modules/ThirdParty/GIFTI/src/gifticlib/CMakeLists.txt	2016-07-06 16:10:33.255144401 +0200
+@@ -22,8 +22,6 @@
+   include_directories(${ITKNIFTI_INCLUDE_DIRS})
+   set(PACKAGE_PREFIX "ITK")
+   set(EXPAT_LIBRARIES ${ITKExpat_LIBRARIES})
+-  set(ZLIB_LIBRARIES ITKznz)
+-  set(NIFTI_LIBRARIES ITKniftiio)
+   set(ZLIB_FOUND 1)
+   set(GIFTI_LIBRARY_PROPERTIES ${ITK_LIBRARY_PROPERTIES})
+ 
+Nur in insighttoolkit4-4.10.0/Modules/ThirdParty/GIFTI/src/gifticlib: CMakeLists.txt~.
+diff -ru insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/ThirdParty/NIFTI/CMakeLists.txt insighttoolkit4-4.10.0/Modules/ThirdParty/NIFTI/CMakeLists.txt
+--- insighttoolkit4-4.10.0.obsolete.0.73584495794876/Modules/ThirdParty/NIFTI/CMakeLists.txt	2016-05-26 17:32:22.000000000 +0200
++++ insighttoolkit4-4.10.0/Modules/ThirdParty/NIFTI/CMakeLists.txt	2016-07-06 16:09:34.890864460 +0200
+@@ -1,10 +1,9 @@
+ project(ITKNIFTI)
+-set(ITKNIFTI_THIRD_PARTY 1)
+ 
+-set(ITKNIFTI_INCLUDE_DIRS
+-  ${ITKNIFTI_SOURCE_DIR}/src/nifti/niftilib
+-  ${ITKNIFTI_SOURCE_DIR}/src/nifti/znzlib
+-  )
+-set(ITKNIFTI_LIBRARIES ITKznz ITKniftiio)
++set(ITKNIFTI_SYSTEM_INCLUDE_DIRS "/usr/include/nifti")
++set(ZLIB_LIBRARIES znz)
++set(NIFTI_LIBRARIES niftiio)
++set(ITKNIFTI_LIBRARIES znz niftiio)
++set(ITKNIFTI_NO_SRC 1)
+ 
+ itk_module_impl()
+Nur in insighttoolkit4-4.10.0/Modules/ThirdParty/NIFTI: CMakeLists.txt~.

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/series
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-07-06 12:47:01 UTC (rev 22404)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/series	2016-07-06 14:20:41 UTC (rev 22405)
@@ -3,3 +3,5 @@
 atomic_load.patch
 flatStructuringElementTest_fix_rescale.patch
 ITKv3MultiResImageRegistrationTest_correct.patch
+itk4.10-correct_itkMathDetail_include-order.patch
+itk4.10-enable-system-nifti.patch

Modified: trunk/packages/insighttoolkit/trunk/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/rules	2016-07-06 12:47:01 UTC (rev 22404)
+++ trunk/packages/insighttoolkit/trunk/debian/rules	2016-07-06 14:20:41 UTC (rev 22405)
@@ -8,6 +8,9 @@
 
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
+#ITK is not properly using system provided headers
+export DEB_CPPFLAGS_MAINT_APPEND = -I/usr/include/nifti 
+
 ifeq ($(DEB_BUILD_ARCH),i386)
   ENABLE_FFTW=OFF
 else