[med-svn] r7650 - in trunk/packages/volview/trunk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Sat Sep 3 17:29:08 UTC 2011
Author: malat-guest
Date: 2011-09-03 17:29:07 +0000 (Sat, 03 Sep 2011)
New Revision: 7650
Modified:
trunk/packages/volview/trunk/debian/control
trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch
Log:
comment out convinient include of libs.
Modified: trunk/packages/volview/trunk/debian/control
===================================================================
--- trunk/packages/volview/trunk/debian/control 2011-09-03 17:03:30 UTC (rev 7649)
+++ trunk/packages/volview/trunk/debian/control 2011-09-03 17:29:07 UTC (rev 7650)
@@ -6,7 +6,7 @@
Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
Build-Depends: debhelper (>= 8), cmake (>= 2.8.2),
libinsighttoolkit3-dev (>= 3.20), libvtk5-dev (>= 5.6),
- libgdcm2-dev (>= 2.0.16)
+ libgdcm2-dev (>= 2.0.16), libkwwidgets1-dev
Standards-Version: 3.9.2
Homepage: http://www.kitware.com/products/volview.html
Vcs-Browser: http://svn.debian.org/wsvn/debian-med/trunk/packages/volview/trunk/?rev=0&sc=0
Modified: trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch
===================================================================
--- trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch 2011-09-03 17:03:30 UTC (rev 7649)
+++ trunk/packages/volview/trunk/debian/patches/addtoplevelcmake.patch 2011-09-03 17:29:07 UTC (rev 7650)
@@ -1,14 +1,14 @@
Index: volview-3.4/CMakeLists.txt
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ volview-3.4/CMakeLists.txt 2011-09-02 18:35:15.000000000 +0200
++++ volview-3.4/CMakeLists.txt 2011-09-03 16:03:22.000000000 +0200
@@ -0,0 +1,2 @@
+project(fake_toplevel)
+subdirs(VolViewPlatformComplete)
Index: volview-3.4/VolViewPlatformComplete/CMakeLists.txt
===================================================================
---- volview-3.4.orig/VolViewPlatformComplete/CMakeLists.txt 2011-09-02 18:36:23.000000000 +0200
-+++ volview-3.4/VolViewPlatformComplete/CMakeLists.txt 2011-09-02 18:36:29.000000000 +0200
+--- volview-3.4.orig/VolViewPlatformComplete/CMakeLists.txt 2011-09-03 16:03:20.000000000 +0200
++++ volview-3.4/VolViewPlatformComplete/CMakeLists.txt 2011-09-03 16:08:28.000000000 +0200
@@ -133,7 +133,7 @@
NOT ITK_SOURCE_DIR OR
NOT VolViewLibraries_SOURCE_DIR OR
@@ -18,3 +18,187 @@
endif(NOT VTK_SOURCE_DIR OR
NOT KWWidgets_SOURCE_DIR OR
NOT ITK_SOURCE_DIR OR
+@@ -256,9 +256,9 @@
+ set(TclTk_LIB_DIR "${PROJECT_BINARY_DIR}/lib")
+ set(TclTk_INSTALL_LIB_DIR "/lib")
+ set(TclTk_INSTALL_BIN_DIR ${VolViewPlatform_INSTALL_BIN_DIR})
+-add_subdirectory(
+- ${VolViewLibraries_SOURCE_DIR}/Utilities/TclTk
+- ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/TclTk)
++#add_subdirectory(
++# ${VolViewLibraries_SOURCE_DIR}/Utilities/TclTk
++# ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/TclTk)
+ set(OLD_BUILD_TESTING ${BUILD_TESTING})
+ set(BUILD_TESTING ${VTK_BUILD_TESTING})
+
+@@ -266,7 +266,7 @@
+
+ set(METAIO_USE_OpenJPEG_DEFAULT ON)
+ set(VTK_DIR ${VolViewPlatform_BINARY_DIR}/VTK)
+-add_subdirectory(${VTK_SOURCE_DIR} ${VTK_DIR})
++#add_subdirectory(${VTK_SOURCE_DIR} ${VTK_DIR})
+
+ set(BUILD_TESTING ${OLD_BUILD_TESTING})
+
+@@ -322,8 +322,8 @@
+ # Volumetric Compression) among other things.
+ SET( GDCM_USE_SYSTEM_OpenJPEG ON CACHE INTERNAL "" FORCE )
+
+-set(GDCM_DIR ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/gdcm)
+-add_subdirectory(${VolViewLibraries_SOURCE_DIR}/Utilities/gdcm ${GDCM_DIR})
++#set(GDCM_DIR ${VolViewPlatform_BINARY_DIR}/VolViewLibraries/Utilities/gdcm)
++#add_subdirectory(${VolViewLibraries_SOURCE_DIR}/Utilities/gdcm ${GDCM_DIR})
+
+ # --------------------------------------------------------------------------
+ # VolViewLibraries: Utilities: gettext
+@@ -341,8 +341,8 @@
+ set(OLD_BUILD_TESTING ${BUILD_TESTING})
+ set(BUILD_TESTING ${ITK_BUILD_TESTING})
+
+-set(ITK_DIR ${VolViewPlatform_BINARY_DIR}/ITK)
+-add_subdirectory(${ITK_SOURCE_DIR} ${ITK_DIR})
++#set(ITK_DIR ${VolViewPlatform_BINARY_DIR}/ITK)
++#add_subdirectory(${ITK_SOURCE_DIR} ${ITK_DIR})
+
+ set(BUILD_TESTING OFF)
+ set(LesionSizingKit_DIR ${VolViewPlatform_BINARY_DIR}/LesionSizingKit)
+@@ -362,12 +362,12 @@
+ find_package(VTK REQUIRED)
+ include(${VTK_USE_FILE})
+
+-set(KWWidgets_DIR ${VolViewPlatform_BINARY_DIR}/KWWidgets)
++#set(KWWidgets_DIR ${VolViewPlatform_BINARY_DIR}/KWWidgets)
+
+ set(HTML_HELP_INCLUDE_PATH "" CACHE INTERNAL "" FORCE)
+ set(HTML_HELP_LIBRARY "" CACHE INTERNAL "" FORCE)
+
+-add_subdirectory(${KWWidgets_SOURCE_DIR} ${KWWidgets_DIR})
++#add_subdirectory(${KWWidgets_SOURCE_DIR} ${KWWidgets_DIR})
+
+ # --------------------------------------------------------------------------
+ # VolViewLibraries
+Index: volview-3.4/VolViewLibraries/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/CMakeLists.txt 2011-09-03 16:04:08.000000000 +0200
++++ volview-3.4/VolViewLibraries/CMakeLists.txt 2011-09-03 16:15:16.000000000 +0200
+@@ -317,7 +317,7 @@
+ set(VTKEdge_BUILD_VolumeRendering_KIT_DEFAULT ON)
+ set(VTKEdge_BUILD_Widgets_KIT_DEFAULT ON)
+ set(VTKEdge_USE_ITK_DEFAULT ON)
+-subdirs(VTKEdge)
++#subdirs(VTKEdge)
+ mark_as_advanced(
+ VTKEdge_BUILD_EXAMPLES
+ VTKEdge_BUILD_PARAVIEW_PLUGINS
+@@ -377,7 +377,7 @@
+ subdirs(Utilities/ctnlib)
+
+ # Curl
+-subdirs( Utilities/Curl )
++#subdirs( Utilities/Curl )
+
+ # --------------------------------------------------------------------------
+ # Utilities: gettext
+@@ -404,7 +404,7 @@
+ ${VTK_SOURCE_DIR}
+ ${VTK_BINARY_DIR}
+ )
+-subdirs(Utilities/cmtar)
++#subdirs(Utilities/cmtar)
+ # with -fPIC
+ if(UNIX AND NOT WIN32)
+ find_program(CMAKE_UNAME uname /bin /usr/bin /usr/local/bin )
+Index: volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWCommonPro/CMakeLists.txt 2011-09-03 16:17:24.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWCommonPro/CMakeLists.txt 2011-09-03 16:24:46.000000000 +0200
+@@ -95,7 +95,7 @@
+ "Build KWCommonPro using GDCM DICOM support." ${default_val})
+ MARK_AS_ADVANCED(KWCommonPro_USE_GDCM)
+ IF(KWCommonPro_USE_GDCM)
+- KWCommonPro_REQUIRE_PACKAGE(GDCM)
++ #KWCommonPro_REQUIRE_PACKAGE(GDCM)
+ ENDIF(KWCommonPro_USE_GDCM)
+
+ # --------------------------------------------------------------------------
+Index: volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-03 19:12:06.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWWidgetsPro/CMakeLists.txt 2011-09-03 19:12:33.000000000 +0200
+@@ -75,7 +75,7 @@
+
+ # VTKEdge
+
+-KWWidgetsPro_REQUIRE_PACKAGE(VTKEdge)
++#KWWidgetsPro_REQUIRE_PACKAGE(VTKEdge)
+
+ # --------------------------------------------------------------------------
+ # Output directories
+Index: volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-03 19:13:06.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWVolView/CMakeLists.txt 2011-09-03 19:14:58.000000000 +0200
+@@ -78,10 +78,10 @@
+ "Build KWVolView with GDCM support." ${default_val})
+ MARK_AS_ADVANCED(KWVolView_USE_GDCM)
+ IF(KWVolView_USE_GDCM)
+- KWVolView_REQUIRE_PACKAGE(GDCM)
+- IF(NOT GDCM_VTK)
+- MESSAGE(FATAL_ERROR "GDCM_VTK is OFF. Please configure and build GDCM with GDCM_VTK set to ON in order to use GDCM's reader and writer classes for VTK.")
+- ENDIF(NOT GDCM_VTK)
++ #KWVolView_REQUIRE_PACKAGE(GDCM)
++ #IF(NOT GDCM_VTK)
++ # MESSAGE(FATAL_ERROR "GDCM_VTK is OFF. Please configure and build GDCM with GDCM_VTK set to ON in order to use GDCM's reader and writer classes for VTK.")
++ #ENDIF(NOT GDCM_VTK)
+ ENDIF(KWVolView_USE_GDCM)
+
+
+@@ -94,7 +94,7 @@
+
+ # VTKEdge
+
+-KWVolView_REQUIRE_PACKAGE(VTKEdge)
++#KWVolView_REQUIRE_PACKAGE(VTKEdge)
+
+ # Use the lesion sizing toolkit ?
+
+Index: volview-3.4/VolViewLibraries/KWVolView/CMake/ExportConfiguration/UseKWVolView.cmake
+===================================================================
+--- volview-3.4.orig/VolViewLibraries/KWVolView/CMake/ExportConfiguration/UseKWVolView.cmake 2011-09-03 19:16:08.000000000 +0200
++++ volview-3.4/VolViewLibraries/KWVolView/CMake/ExportConfiguration/UseKWVolView.cmake 2011-09-03 19:16:57.000000000 +0200
+@@ -60,23 +60,23 @@
+ # Use VTKEdge.
+ IF(NOT KWVolView_NO_USE_VTKEdge)
+ SET(VTKEdge_DIR ${KWVolView_VTKEdge_DIR})
+- FIND_PACKAGE(VTKEdge)
+- IF(VTKEdge_FOUND)
+- INCLUDE(${VTKEdge_USE_FILE})
+- ELSE(VTKEdge_FOUND)
+- MESSAGE("VTKEdge not found in KWVolView_VTKEdge_DIR=\"${KWVolView_VTKEdge_DIR}\".")
+- ENDIF(VTKEdge_FOUND)
++ #FIND_PACKAGE(VTKEdge)
++ #IF(VTKEdge_FOUND)
++ # INCLUDE(${VTKEdge_USE_FILE})
++ #ELSE(VTKEdge_FOUND)
++ # MESSAGE("VTKEdge not found in KWVolView_VTKEdge_DIR=\"${KWVolView_VTKEdge_DIR}\".")
++ #ENDIF(VTKEdge_FOUND)
+ ENDIF(NOT KWVolView_NO_USE_VTKEdge)
+
+ # Use GDCM.
+ IF(KWVolView_USE_GDCM)
+ SET(GDCM_DIR ${KWVolView_GDCM_DIR})
+- FIND_PACKAGE(GDCM)
+- IF(GDCM_FOUND)
+- INCLUDE(${GDCM_USE_FILE})
+- ELSE(GDCM_FOUND)
+- MESSAGE("GDCM not found in KWVolView_GDCM_DIR=\"${KWVolView_GDCM_DIR}\".")
+- ENDIF(GDCM_FOUND)
++ #FIND_PACKAGE(GDCM)
++ #IF(GDCM_FOUND)
++ # INCLUDE(${GDCM_USE_FILE})
++ #ELSE(GDCM_FOUND)
++ # MESSAGE("GDCM not found in KWVolView_GDCM_DIR=\"${KWVolView_GDCM_DIR}\".")
++ #ENDIF(GDCM_FOUND)
+ ENDIF(KWVolView_USE_GDCM)
+
+ ENDIF(NOT KWVolView_USE_FILE_INCLUDED)
More information about the debian-med-commit
mailing list