[med-svn] r4882 - trunk/packages/insighttoolkit/trunk/debian/patches

[Steven Michael Robbins]

Author: smr
Date: 2010-06-11 09:21:14 +0000 (Fri, 11 Jun 2010)
New Revision: 4882

Modified:
   trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch
Log:
Remove all traces of ITKBuildSettings.cmake

Modified: trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch
===================================================================
--- trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch	2010-06-10 03:41:43 UTC (rev 4881)
+++ trunk/packages/insighttoolkit/trunk/debian/patches/remove-cmake-export-build-settings.patch	2010-06-11 09:21:14 UTC (rev 4882)
@@ -11,3 +11,69 @@
  # Save library dependencies.
  EXPORT_LIBRARY_DEPENDENCIES(${ITK_BINARY_DIR}/ITKLibraryDepends.cmake)
  
+@@ -861,7 +857,6 @@
+ 
+ IF(NOT ITK_INSTALL_NO_DEVELOPMENT)
+   INSTALL(FILES
+-    ${ITK_BINARY_DIR}/ITKBuildSettings.cmake
+     ${ITK_BINARY_DIR}/ITKLibraryDepends.cmake
+     ${ITK_BINARY_DIR}/UseITK.cmake
+     DESTINATION ${ITK_INSTALL_PACKAGE_DIR_CM24}
+--- insighttoolkit-3.18.0.orig/ITKConfig.cmake.in
++++ insighttoolkit-3.18.0/ITKConfig.cmake.in
+@@ -25,9 +25,6 @@
+ # The location of the UseITK.cmake file.
+ SET(ITK_USE_FILE "@ITK_USE_FILE@")
+ 
+-# The build settings file.
+-SET(ITK_BUILD_SETTINGS_FILE "@ITK_BUILD_SETTINGS_FILE@")
+-
+ # The library dependencies file.
+ SET(ITK_LIBRARY_DEPENDS_FILE "@ITK_LIBRARY_DEPENDS_FILE@")
+ 
+--- insighttoolkit-3.18.0.orig/Testing/Code/Common/itkSystemInformationTest.cxx
++++ insighttoolkit-3.18.0/Testing/Code/Common/itkSystemInformationTest.cxx
+@@ -140,7 +140,6 @@
+       ITK_SYSTEM_INFORMATION_DIR "/CMakeFiles/CMakeError.log",
+       ITK_SYSTEM_INFORMATION_DIR "/CMakeOutput.log",
+       ITK_SYSTEM_INFORMATION_DIR "/CMakeError.log",
+-      ITK_SYSTEM_INFORMATION_DIR "/ITKBuildSettings.cmake",
+       ITK_SYSTEM_INFORMATION_DIR "/ITKLibraryDepends.cmake",
+       ITK_SYSTEM_INFORMATION_DIR "/ITKConfig.cmake",
+       0
+--- insighttoolkit-3.18.0.orig/UseITK.cmake.in
++++ insighttoolkit-3.18.0/UseITK.cmake.in
+@@ -5,11 +5,6 @@
+ # obtained from ITKConfig.cmake.
+ #
+ 
+-IF(ITK_BUILD_SETTINGS_FILE AND NOT SKIP_ITK_BUILD_SETTINGS_FILE)
+-  INCLUDE(${CMAKE_ROOT}/Modules/CMakeImportBuildSettings.cmake)
+-  CMAKE_IMPORT_BUILD_SETTINGS(${ITK_BUILD_SETTINGS_FILE})
+-ENDIF(ITK_BUILD_SETTINGS_FILE AND NOT SKIP_ITK_BUILD_SETTINGS_FILE)
+-
+ # Add compiler flags needed to use ITK.
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ITK_REQUIRED_C_FLAGS}")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ITK_REQUIRED_CXX_FLAGS}")
+--- insighttoolkit-3.18.0.orig/itkGenerateITKConfig.cmake
++++ insighttoolkit-3.18.0/itkGenerateITKConfig.cmake
+@@ -39,9 +39,6 @@
+ # The "use" file.
+ SET(ITK_USE_FILE ${ITK_BINARY_DIR}/UseITK.cmake)
+ 
+-# The build settings file.
+-SET(ITK_BUILD_SETTINGS_FILE ${ITK_BINARY_DIR}/ITKBuildSettings.cmake)
+-
+ # Library directory.
+ SET(ITK_LIBRARY_DIRS_CONFIG ${ITK_LIBRARY_PATH})
+ 
+@@ -74,9 +71,6 @@
+ # The "use" file.
+ SET(ITK_USE_FILE \${ITK_INSTALL_PREFIX}${ITK_INSTALL_PACKAGE_DIR}/UseITK.cmake)
+ 
+-# The build settings file.
+-SET(ITK_BUILD_SETTINGS_FILE \${ITK_INSTALL_PREFIX}${ITK_INSTALL_PACKAGE_DIR}/ITKBuildSettings.cmake)
+-
+ # Include directories.
+ SET(ITK_INCLUDE_DIRS_CONFIG \${ITK_INSTALL_PREFIX}${ITK_INSTALL_INCLUDE_DIR})
+ FOREACH(DIR ${ITK_INCLUDE_RELATIVE_DIRS})