[med-svn] r16399 - trunk/packages/insighttoolkit/branches/itk4-enable-python/debian

[Gert Wollny]

Author: gert-guest
Date: 2014-03-07 11:15:12 +0000 (Fri, 07 Mar 2014)
New Revision: 16399

Modified:
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in
   trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules
Log:
update the fftw dependencies

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog	2014-03-06 21:20:55 UTC (rev 16398)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/changelog	2014-03-07 11:15:12 UTC (rev 16399)
@@ -3,8 +3,9 @@
   [Gert Wollny]
   * new uptream
   * enable python2.7 bindings
+  * update build dependencies to new wrapping method
 
- -- Gert Wollny <wollny at die.upm.es>  Mon, 24 Feb 2014 11:39:21 +0100
+ -- Gert Wollny <wollny at die.upm.es>  Wed, 05 Mar 2014 11:39:21 +0100
 
 insighttoolkit4 (4.5.0-3) unstable; urgency=low
 

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in	2014-03-06 21:20:55 UTC (rev 16398)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/control.in	2014-03-07 11:15:12 UTC (rev 16399)
@@ -7,7 +7,7 @@
 Build-Depends: debhelper (>= 9),
  	cmake, 
 	swig (>= 2.0), 
-	gccxml (>= 0.9.0+cvs20120309),
+	gccxml (>= 0.9.0+cvs20140205),
 	zlib1g-dev (>= 1.2.2), 
 	libpng12-dev, 
 	libtiff-dev,

Modified: trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules
===================================================================
--- trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules	2014-03-06 21:20:55 UTC (rev 16398)
+++ trunk/packages/insighttoolkit/branches/itk4-enable-python/debian/rules	2014-03-07 11:15:12 UTC (rev 16399)
@@ -9,6 +9,10 @@
 #
 # system HDF5 (omits C++ bindings; Bug #660547)
 # system FFTW (test failures; see http://lists.debian.org/debian-med/2012/04/msg00064.html)
+#             ( __float128 not parsed by gccxml on i386 
+#              http://public.kitware.com/pipermail/gccxml/2011-December/thread.html#1470
+#              http://www.gccxml.org/Bug/view.php?id=14794)
+#
 # system VXL (Bug #656837)
 # Module_ITKLevelSetsv4Visualization (https://issues.itk.org/jira/browse/ITK-2856)
 # Module_ITKVideoBridgeOpenCV (undiagnosed build error)
@@ -18,6 +22,12 @@
 # multi-python, no idea how to do this without re-compiling all and everything for 
 #     each python version    
 
+ifeq ($(DEB_BUILD_ARCH),i386)
+    ENABLE_FFTW=OFF
+else
+    ENABLE_FFTW=ON
+endif 
+
 CMAKE_FLAGS = \
 	-DBUILD_EXAMPLES:BOOL=ON \
 	-DBUILD_SHARED_LIBS:BOOL=ON \
@@ -26,12 +36,12 @@
 	-DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=ON \
 	-DCMAKE_SKIP_RPATH:BOOL=ON \
 	-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \
-        -DUSE_FFTWF=ON \
-	-DITK_USE_FFTWD:BOOL=ON \
-	-DITK_USE_FFTWF:BOOL=ON \
+	-DUSE_FFTWF=$(ENABLE_FFTW) \
+	-DITK_USE_FFTWD:BOOL=$(ENABLE_FFTW) \
+	-DITK_USE_FFTWF:BOOL=$(ENABLE_FFTW) \
+	-DITK_USE_SYSTEM_FFTW:BOOL=$(ENABLE_FFTW) \
 	-DITK_USE_STRICT_CONCEPT_CHECKING:BOOL=ON \
 	-DITK_USE_SYSTEM_DCMTK:BOOL=ON \
-	-DITK_USE_SYSTEM_FFTW:BOOL=ON \
 	-DITK_USE_SYSTEM_GDCM:BOOL=ON \
 	-DITK_USE_SYSTEM_DOUBLECONVERSION:BOOL=OFF \
 	-DITK_USE_SYSTEM_HDF5:BOOL=OFF \