[med-svn] r16406 - trunk/packages/elastix/trunk/debian/patches

[Gert Wollny]

Author: gert-guest
Date: 2014-03-10 10:38:12 +0000 (Mon, 10 Mar 2014)
New Revision: 16406

Removed:
   trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch
   trunk/packages/elastix/trunk/debian/patches/itk-review-detection.patch
Log:
actually delete the old patches from svn

Deleted: trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch	2014-03-10 10:37:01 UTC (rev 16405)
+++ trunk/packages/elastix/trunk/debian/patches/disable-mevisdicomtiff.patch	2014-03-10 10:38:12 UTC (rev 16406)
@@ -1,93 +0,0 @@
-Description: Correct sources to honour ELASTIX_USE_MEVISDICOMTIFF=false
-Origin: https://bugs.gentoo.org/attachment.cgi?id=350734&action=diff
-Forwarded: no
-Author: Gert Wollny gw.fossdev at gmail.com 
-Reviewed-by: Steve M. Robbins <smr at debian.org>
-
-
---- elastix-4.6.orig/src/Common/MevisDicomTiff/CMakeLists.txt
-+++ elastix-4.6/src/Common/MevisDicomTiff/CMakeLists.txt
-@@ -3,7 +3,7 @@
- 
- IF( ELASTIX_USE_MEVISDICOMTIFF )
-   ADD_DEFINITIONS( -D_ELASTIX_USE_MEVISDICOMTIFF )
--ENDIF()
-+
- 
- ADD_LIBRARY( mevisdcmtiff
-   itkMevisDicomTiffImageIO.cxx
-@@ -18,3 +18,4 @@
- 
- # add mevisdcmtiff to the list of target_link_libraries in your cmakelists.txt file.
- 
-+ENDIF()
---- elastix-4.6.orig/src/Core/CMakeLists.txt
-+++ elastix-4.6/src/Core/CMakeLists.txt
-@@ -142,7 +142,6 @@
-   xoutlib
-   elxCommon
-   elxCore
--  ${mevisdcmtifflib}
-   ${AllComponentLibs}
-   ${ITK_LIBRARIES}
- )
-@@ -155,11 +154,14 @@
-   xoutlib
-   elxCommon
-   elxCore
--  ${mevisdcmtifflib}
-   ${AllComponentLibs}
-   ${ITK_LIBRARIES}
- )
- 
-+IF( ELASTIX_USE_MEVISDICOMTIFF )
-+  TARGET_LINK_LIBRARIES( elastix   ${mevisdcmtifflib})
-+  TARGET_LINK_LIBRARIES( transformix ${mevisdcmtifflib})
-+ENDIF( ELASTIX_USE_MEVISDICOMTIFF )
- #---------------------------------------------------------------------
- # Define the install directory for elastix and transformix.
- 
---- elastix-4.6.orig/src/Core/Main/elastix.cxx
-+++ elastix-4.6/src/Core/Main/elastix.cxx
-@@ -64,8 +64,10 @@
-   typedef std::queue< ArgPairType >                   ParameterFileListType;
-   typedef ParameterFileListType::value_type           ParameterFileListEntryType;
- 
-+#ifdef _ELASTIX_USE_MEVISDICOMTIFF
-   /** Support Mevis Dicom Tiff (if selected in cmake) */
-   RegisterMevisDicomTiff();
-+#endif 
- 
-   /** Some declarations and initialisations. */
-   ElastixMainVectorType elastices;
---- elastix-4.6.orig/src/Core/Main/transformix.cxx
-+++ elastix-4.6/src/Core/Main/transformix.cxx
-@@ -55,9 +55,10 @@
-   typedef TransformixMainType::ArgumentMapType      ArgumentMapType;
-   typedef ArgumentMapType::value_type               ArgumentMapEntryType;
- 
-+#ifdef _ELASTIX_USE_MEVISDICOMTIFF
-   /** Support Mevis Dicom Tiff (if selected in cmake) */
-   RegisterMevisDicomTiff();
--
-+#endif 
-   /** Declare an instance of the Transformix class. */
-   TransformixMainPointer  transformix;
- 
---- elastix-4.6.orig/src/Testing/CMakeLists.txt
-+++ elastix-4.6/src/Testing/CMakeLists.txt
-@@ -45,9 +45,13 @@
-   target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}
-     elxCommon # needed for elxTimer
-     ${ITK_LIBRARIES}
--    ${mevisdcmtifflib}
-   )
- 
-+if( ELASTIX_USE_MEVISDICOMTIFF )
-+  target_link_libraries( ${ELXTEST_EXECUTABLE_NAME}     ${mevisdcmtifflib})
-+endif( ELASTIX_USE_MEVISDICOMTIFF )
-+
-+
-   # Group in IDE's like Visual Studio
-   set_property( TARGET ${ELXTEST_EXECUTABLE_NAME} PROPERTY FOLDER "tests" )
- 

Deleted: trunk/packages/elastix/trunk/debian/patches/itk-review-detection.patch
===================================================================
--- trunk/packages/elastix/trunk/debian/patches/itk-review-detection.patch	2014-03-10 10:37:01 UTC (rev 16405)
+++ trunk/packages/elastix/trunk/debian/patches/itk-review-detection.patch	2014-03-10 10:38:12 UTC (rev 16406)
@@ -1,15 +0,0 @@
---- elastix-4.6.orig/src/CMakeLists.txt
-+++ elastix-4.6/src/CMakeLists.txt
-@@ -77,9 +77,9 @@
- #-------------------------------------------------------------------------
- # elastix depends on some ITK settings
- 
--IF( NOT ITK_USE_REVIEW )
--  message( SEND_ERROR "ITK_USE_REVIEW has not been set to ON when compiling ITK. This option is mandatory for elastix to build.\nPlease recompile your ITK installation." )
--ENDIF()
-+if( NOT ITKReview_LOADED )
-+  message( SEND_ERROR "Module_ITKReview has not been set to ON when compiling ITK. This option is mandatory for elastix to build.\nPlease recompile your ITK installation." )
-+endif()
- 
- #---------------------------------------------------------------------
- # If IDE supports it, do use folder view.