[med-svn] r7656 - in trunk/packages/ctk/debian: . patches
Mathieu Malaterre
malat-guest at alioth.debian.org
Sun Sep 4 12:57:55 UTC 2011
Author: malat-guest
Date: 2011-09-04 12:57:55 +0000 (Sun, 04 Sep 2011)
New Revision: 7656
Modified:
trunk/packages/ctk/debian/changelog
trunk/packages/ctk/debian/control
trunk/packages/ctk/debian/libctk0.1.lintian-overrides
trunk/packages/ctk/debian/patches/fixdcmtk.patch
trunk/packages/ctk/debian/patches/series
trunk/packages/ctk/debian/rules
Log:
Wrapup everything
Modified: trunk/packages/ctk/debian/changelog
===================================================================
--- trunk/packages/ctk/debian/changelog 2011-09-04 12:16:25 UTC (rev 7655)
+++ trunk/packages/ctk/debian/changelog 2011-09-04 12:57:55 UTC (rev 7656)
@@ -1,11 +1,12 @@
-ctk (0.1.0~git622a40d-1) UNRELEASED; urgency=low
+ctk (0.1.0~git622a40d-1) unstable; urgency=low
* Use newer git commit, to allow building with DCMTK 3.6.0
+ - Build CTK/DICOM module
* Fix spelling in d/control. Closes: #635569
* Add BFD module (requires binutils-dev)
- * Build CTK/DICOM module
+ * Remove a test (takes too long)
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Sat, 03 Sep 2011 18:31:29 +0200
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com> Sun, 04 Sep 2011 14:53:54 +0200
ctk (0.1.0-4) experimental; urgency=low
Modified: trunk/packages/ctk/debian/control
===================================================================
--- trunk/packages/ctk/debian/control 2011-09-04 12:16:25 UTC (rev 7655)
+++ trunk/packages/ctk/debian/control 2011-09-04 12:57:55 UTC (rev 7656)
@@ -5,7 +5,7 @@
DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 8), cmake (>= 2.8.2), cdbs, libqt4-dev,
libdcmtk2-dev, libinsighttoolkit3-dev, libgdcm2-dev, zlib1g-dev, libvtk5-dev,
- libpythonqt2-dev, python-dev, binutils-dev
+ libpythonqt2-dev, python-dev, binutils-dev, libwrap0-dev
Standards-Version: 3.9.2
Section: libs
Homepage: http://www.commontk.org/
Modified: trunk/packages/ctk/debian/libctk0.1.lintian-overrides
===================================================================
--- trunk/packages/ctk/debian/libctk0.1.lintian-overrides 2011-09-04 12:16:25 UTC (rev 7655)
+++ trunk/packages/ctk/debian/libctk0.1.lintian-overrides 2011-09-04 12:57:55 UTC (rev 7656)
@@ -1,4 +1,4 @@
-libctk0.1: package-name-doesnt-match-sonames libCTKCore0.1 libCTKDummyPlugin0.1 libCTKPluginFramework0.1
+# W: libctk0.1: package-name-doesnt-match-sonames libCTKCore0.1 libCTKDICOMCore0.1 libCTKImageProcessingITKCore0.1 libCTKPluginFramework0.1 libCTKVisualizationVTKCore0.1 libCTKWidgets0.1
+libctk0.1: package-name-doesnt-match-sonames
# Upstream is mentioning the "GNU General Public License" in their non-GPL license
libctk0.1: copyright-should-refer-to-common-license-file-for-gpl
-
Modified: trunk/packages/ctk/debian/patches/fixdcmtk.patch
===================================================================
--- trunk/packages/ctk/debian/patches/fixdcmtk.patch 2011-09-04 12:16:25 UTC (rev 7655)
+++ trunk/packages/ctk/debian/patches/fixdcmtk.patch 2011-09-04 12:57:55 UTC (rev 7656)
@@ -113,3 +113,545 @@
ctkMacroBuildLib(
NAME ${PROJECT_NAME}
EXPORT_DIRECTIVE ${KIT_export_directive}
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 13:57:03.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 13:57:16.000000000 +0200
+@@ -20,6 +20,7 @@
+
+ ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+ TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
++TARGET_LINK_LIBRARIES(${KIT}CppTests -lxml2 -lssl -lcrypto -ldcmdsig -ltiff -ldcmnet -lwrap)
+
+ SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
+
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt 2011-09-04 13:58:22.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/Testing/Cpp/CMakeLists.txt 2011-09-04 14:02:59.000000000 +0200
+@@ -22,6 +22,7 @@
+
+ ADD_EXECUTABLE(${KIT}CppTests ${Tests})
+ TARGET_LINK_LIBRARIES(${KIT}CppTests ${LIBRARY_NAME})
++TARGET_LINK_LIBRARIES(${KIT}CppTests -lxml2 -lssl -lcrypto -ldcmdsig -ltiff -ldcmnet -lwrap -loflog)
+
+ SET( KIT_TESTS ${CPP_TEST_PATH}/${KIT}CppTests)
+
+Index: ctk-0.1.0~git622a40d/Libs/Scripting/Python/Core/CMakeLists.txt
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/Scripting/Python/Core/CMakeLists.txt 2011-09-04 14:04:07.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/Scripting/Python/Core/CMakeLists.txt 2011-09-04 14:06:31.000000000 +0200
+@@ -6,6 +6,10 @@
+ IF(CTK_LIB_Scripting/Python/Core_PYTHONQT_USE_VTK)
+ INCLUDE(${VTK_USE_FILE})
+ ENDIF()
++include_directories(
++ /usr/include/PythonQt
++ /usr/include/python2.6/
++ )
+
+ #
+ # See CTK/CMake/ctkMacroBuildLib.cmake for details
+Index: ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.h
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/DICOM/Core/ctkDICOMDataset.h 2011-09-04 14:37:24.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/DICOM/Core/ctkDICOMDataset.h 2011-09-04 14:37:24.000000000 +0200
+@@ -25,7 +25,8 @@
+
+ #include "ctkDICOMPersonName.h"
+
+-#include <dcdatset.h> // DCMTK DcmDataset
++#define HAVE_CONFIG_H
++#include <dcmtk/dcmdata/dcdatset.h> // DCMTK DcmDataset
+
+ #include <QtCore>
+
+Index: ctk-0.1.0~git622a40d/Libs/Widgets/Testing/Cpp/CMakeLists.txt
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 14:37:24.000000000 +0200
++++ ctk-0.1.0~git622a40d/Libs/Widgets/Testing/Cpp/CMakeLists.txt 2011-09-04 14:37:24.000000000 +0200
+@@ -15,7 +15,7 @@
+ ctkCollapsibleButtonTest2.cpp
+ ctkCollapsibleGroupBoxTest1.cpp
+ ctkColorDialogTest1.cpp
+- ctkColorDialogTest2.cpp
++ #ctkColorDialogTest2.cpp
+ ctkColorPickerButtonTest1.cpp
+ ctkComboBoxTest1.cpp
+ ctkCompleterTest1.cpp
+Index: ctk-0.1.0~git622a40d/Utilities/CMake/FindDCMTK.cmake
+===================================================================
+--- ctk-0.1.0~git622a40d.orig/Utilities/CMake/FindDCMTK.cmake 2011-09-04 14:37:24.000000000 +0200
++++ ctk-0.1.0~git622a40d/Utilities/CMake/FindDCMTK.cmake 2011-09-04 14:37:24.000000000 +0200
+@@ -1,7 +1,7 @@
+ # - find DCMTK libraries and applications
+ #
+
+-# DCMTK_INCLUDE_DIR - Directories to include to use DCMTK
++# DCMTK_INCLUDE_DIRS - Directories to include to use DCMTK
+ # DCMTK_LIBRARIES - Files to link against to use DCMTK
+ # DCMTK_FOUND - If false, don't try to use DCMTK
+ # DCMTK_DIR - (optional) Source directory for DCMTK
+@@ -13,7 +13,8 @@
+
+ #=============================================================================
+ # Copyright 2004-2009 Kitware, Inc.
+-# Copyright 2009 Mathieu Malaterre <mathieu.malaterre at gmail.com>
++# Copyright 2009-2010 Mathieu Malaterre <mathieu.malaterre at gmail.com>
++# Copyright 2010 Thomas Sondergaard <ts at medical-insight.com>
+ #
+ # Distributed under the OSI-approved BSD License (the "License");
+ # see accompanying file Copyright.txt for details.
+@@ -28,338 +29,124 @@
+ #
+ # Written for VXL by Amitha Perera.
+ # Upgraded for GDCM by Mathieu Malaterre.
+-#
++# Modified for EasyViz by Thomas Sondergaard.
++#
++
++if(NOT DCMTK_FOUND AND NOT DCMTK_DIR)
++ set(DCMTK_DIR
++ "/usr/include/dcmtk/"
++ CACHE
++ PATH
++ "Root of DCMTK source tree (optional).")
++ mark_as_advanced(DCMTK_DIR)
++endif()
++
++
++foreach(lib
++ dcmdata
++ dcmimage
++ dcmimgle
++ dcmjpeg
++ dcmnet
++ dcmpstat
++ dcmqrdb
++ dcmsign
++ dcmsr
++ dcmtls
++ ijg12
++ ijg16
++ ijg8
++ ofstd)
++
++ find_library(DCMTK_${lib}_LIBRARY
++ ${lib}
++ PATHS
++ ${DCMTK_DIR}/${lib}/libsrc
++ ${DCMTK_DIR}/${lib}/libsrc/Release
++ ${DCMTK_DIR}/${lib}/libsrc/Debug
++ ${DCMTK_DIR}/${lib}/Release
++ ${DCMTK_DIR}/${lib}/Debug
++ ${DCMTK_DIR}/lib)
++
++ mark_as_advanced(DCMTK_${lib}_LIBRARY)
++
++ if(DCMTK_${lib}_LIBRARY)
++ list(APPEND DCMTK_LIBRARIES ${DCMTK_${lib}_LIBRARY})
++ endif()
++
++endforeach()
++
++
++set(DCMTK_config_TEST_HEADER osconfig.h)
++set(DCMTK_dcmdata_TEST_HEADER dctypes.h)
++set(DCMTK_dcmimage_TEST_HEADER dicoimg.h)
++set(DCMTK_dcmimgle_TEST_HEADER dcmimage.h)
++set(DCMTK_dcmjpeg_TEST_HEADER djdecode.h)
++set(DCMTK_dcmnet_TEST_HEADER assoc.h)
++set(DCMTK_dcmpstat_TEST_HEADER dcmpstat.h)
++set(DCMTK_dcmqrdb_TEST_HEADER dcmqrdba.h)
++set(DCMTK_dcmsign_TEST_HEADER sicert.h)
++set(DCMTK_dcmsr_TEST_HEADER dsrtree.h)
++set(DCMTK_dcmtls_TEST_HEADER tlslayer.h)
++set(DCMTK_ofstd_TEST_HEADER ofstdinc.h)
++
++foreach(dir
++ config
++ dcmdata
++ dcmimage
++ dcmimgle
++ dcmjpeg
++ dcmnet
++ dcmpstat
++ dcmqrdb
++ dcmsign
++ dcmsr
++ dcmtls
++ ofstd)
++ find_path(DCMTK_${dir}_INCLUDE_DIR
++ ${DCMTK_${dir}_TEST_HEADER}
++ PATHS
++ ${DCMTK_DIR}/${dir}/include
++ ${DCMTK_DIR}/${dir}
++ ${DCMTK_DIR}/include/${dir})
++
++ mark_as_advanced(DCMTK_${dir}_INCLUDE_DIR)
++
++ if(DCMTK_${dir}_INCLUDE_DIR)
++ list(APPEND
++ DCMTK_INCLUDE_DIRS
++ ${DCMTK_${dir}_INCLUDE_DIR})
++ endif()
++endforeach()
++
++if(WIN32)
++ list(APPEND DCMTK_LIBRARIES netapi32 wsock32)
++endif()
+
+-IF( NOT DCMTK_FOUND )
+- SET( DCMTK_DIR "/usr/include/dcmtk/"
+- CACHE PATH "Root of DCMTK source tree (optional)." )
+- MARK_AS_ADVANCED( DCMTK_DIR )
+-ENDIF( NOT DCMTK_FOUND )
+-
+-FIND_PATH( DCMTK_config_INCLUDE_DIR osconfig.h
+- PATHS
+- ${DCMTK_DIR}/config/include
+- ${DCMTK_DIR}/config
+- ${DCMTK_DIR}/include/dcmtk/config
+- ${DCMTK_DIR}/include
+- NO_DEFAULT_PATH
+-
+-)
+-
+-FIND_PATH( DCMTK_ofstd_INCLUDE_DIR ofstdinc.h
+- PATHS
+- ${DCMTK_DIR}/ofstd/include
+- ${DCMTK_DIR}/ofstd
+- ${DCMTK_DIR}/include/ofstd
+- ${DCMTK_DIR}/include/dcmtk/ofstd
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_ofstd_LIBRARY ofstd
+- PATHS
+- ${DCMTK_DIR}/ofstd/libsrc
+- ${DCMTK_DIR}/ofstd/libsrc/Release
+- ${DCMTK_DIR}/ofstd/libsrc/Debug
+- ${DCMTK_DIR}/ofstd/Release
+- ${DCMTK_DIR}/ofstd/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_PATH( DCMTK_oflog_INCLUDE_DIR logger.h
+- PATHS
+- ${DCMTK_DIR}/oflog/include
+- ${DCMTK_DIR}/oflog
+- ${DCMTK_DIR}/include/oflog
+- ${DCMTK_DIR}/include/dcmtk/oflog
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_oflog_LIBRARY oflog
+- PATHS
+- ${DCMTK_DIR}/oflog/libsrc
+- ${DCMTK_DIR}/oflog/libsrc/Release
+- ${DCMTK_DIR}/oflog/libsrc/Debug
+- ${DCMTK_DIR}/oflog/Release
+- ${DCMTK_DIR}/oflog/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-
+-
+-FIND_PATH( DCMTK_dcmdata_INCLUDE_DIR dctypes.h
+- PATHS
+- ${DCMTK_DIR}/include/dcmdata
+- ${DCMTK_DIR}/include/dcmtk/dcmdata
+- ${DCMTK_DIR}/dcmdata
+- ${DCMTK_DIR}/dcmdata/include
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_dcmdata_LIBRARY dcmdata
+- PATHS
+- ${DCMTK_DIR}/dcmdata/libsrc
+- ${DCMTK_DIR}/dcmdata/libsrc/Release
+- ${DCMTK_DIR}/dcmdata/libsrc/Debug
+- ${DCMTK_DIR}/dcmdata/Release
+- ${DCMTK_DIR}/dcmdata/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_PATH( DCMTK_dcmjpeg_INCLUDE_DIR djdecode.h
+- PATHS
+- ${DCMTK_DIR}/include/dcmjpeg
+- ${DCMTK_DIR}/include/dcmtk/dcmjpeg
+- ${DCMTK_DIR}/dcmjpeg
+- ${DCMTK_DIR}/dcmjpeg/include
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_dcmjpeg_LIBRARY dcmjpeg
+- PATHS
+- ${DCMTK_DIR}/dcmjpeg/libsrc
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
+- ${DCMTK_DIR}/dcmjpeg/Release
+- ${DCMTK_DIR}/dcmjpeg/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_ijg12_LIBRARY ijg12
+- PATHS
+- ${DCMTK_DIR}/dcmjpeg/libsrc
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
+- ${DCMTK_DIR}/dcmjpeg/Release
+- ${DCMTK_DIR}/dcmjpeg/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_ijg16_LIBRARY ijg16
+- PATHS
+- ${DCMTK_DIR}/dcmjpeg/libsrc
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
+- ${DCMTK_DIR}/dcmjpeg/Release
+- ${DCMTK_DIR}/dcmjpeg/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_ijg8_LIBRARY ijg8
+- PATHS
+- ${DCMTK_DIR}/dcmjpeg/libsrc
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Release
+- ${DCMTK_DIR}/dcmjpeg/libsrc/Debug
+- ${DCMTK_DIR}/dcmjpeg/Release
+- ${DCMTK_DIR}/dcmjpeg/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_PATH( DCMTK_dcmnet_INCLUDE_DIR dimse.h
+- PATHS
+- ${DCMTK_DIR}/include/dcmnet
+- ${DCMTK_DIR}/include/dcmtk/dcmnet
+- ${DCMTK_DIR}/dcmnet
+- ${DCMTK_DIR}/dcmnet/include
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_dcmnet_LIBRARY dcmnet
+- PATHS
+- ${DCMTK_DIR}/dcmnet/libsrc
+- ${DCMTK_DIR}/dcmnet/libsrc/Release
+- ${DCMTK_DIR}/dcmnet/libsrc/Debug
+- ${DCMTK_DIR}/dcmnet/Release
+- ${DCMTK_DIR}/dcmnet/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_PATH( DCMTK_dcmimgle_INCLUDE_DIR dcmimage.h
+- PATHS
+- ${DCMTK_DIR}/dcmimgle/include
+- ${DCMTK_DIR}/dcmimgle
+- ${DCMTK_DIR}/include/dcmimgle
+- ${DCMTK_DIR}/include/dcmtk/dcmimgle
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_dcmimgle_LIBRARY dcmimgle
+- PATHS
+- ${DCMTK_DIR}/dcmimgle/libsrc
+- ${DCMTK_DIR}/dcmimgle/libsrc/Release
+- ${DCMTK_DIR}/dcmimgle/libsrc/Debug
+- ${DCMTK_DIR}/dcmimgle/Release
+- ${DCMTK_DIR}/dcmimgle/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_PATH( DCMTK_dcmimage_INCLUDE_DIR diregist.h
+- PATHS
+- ${DCMTK_DIR}/dcmimage/include
+- ${DCMTK_DIR}/dcmimage
+- ${DCMTK_DIR}/include/dcmimage
+- ${DCMTK_DIR}/include/dcmtk/dcmimage
+- NO_DEFAULT_PATH
+-)
+-
+-FIND_LIBRARY( DCMTK_dcmimage_LIBRARY dcmimage
+- PATHS
+- ${DCMTK_DIR}/dcmimage/libsrc
+- ${DCMTK_DIR}/dcmimage/libsrc/Release
+- ${DCMTK_DIR}/dcmimage/libsrc/Debug
+- ${DCMTK_DIR}/dcmimage/Release
+- ${DCMTK_DIR}/dcmimage/Debug
+- ${DCMTK_DIR}/lib
+- NO_DEFAULT_PATH
+-)
+-
+-# MM: I could not find this library on debian system / dcmtk 3.5.4
+-# Michael Onken: this module is now called dcmqrdb. I will re-work that script soon...
+-FIND_LIBRARY(DCMTK_imagedb_LIBRARY imagedb
+- PATHS
+- ${DCMTK_DIR}/imagectn/libsrc/Release
+- ${DCMTK_DIR}/imagectn/libsrc/
+- ${DCMTK_DIR}/imagectn/libsrc/Debug
+- NO_DEFAULT_PATH
+- )
+-
+-IF( DCMTK_config_INCLUDE_DIR
+- AND DCMTK_ofstd_INCLUDE_DIR
+- AND DCMTK_ofstd_LIBRARY
+- AND DCMTK_oflog_INCLUDE_DIR
+- AND DCMTK_oflog_LIBRARY
+- AND DCMTK_dcmdata_INCLUDE_DIR
+- AND DCMTK_dcmdata_LIBRARY
+- AND DCMTK_dcmjpeg_INCLUDE_DIR
+- AND DCMTK_dcmjpeg_LIBRARY
+- AND DCMTK_dcmnet_INCLUDE_DIR
+- AND DCMTK_dcmnet_LIBRARY
+- AND DCMTK_dcmimgle_INCLUDE_DIR
+- AND DCMTK_dcmimgle_LIBRARY
+- AND DCMTK_dcmimage_INCLUDE_DIR
+- AND DCMTK_dcmimage_LIBRARY)
+-
+-# # Wrap library is required on Linux
+-# IF(NOT WIN32)
+-# FIND_LIBRARY(DCMTK_wrap_LIBRARY wrap)
+-# MESSAGE(DCMTK_wrap_LIBRARY:${DCMTK_wrap_LIBRARY})
+-# IF(NOT DCMTK_wrap_LIBRARY)
+-# MESSAGE(FATAL_ERROR "error: Wrap library is required to use DCMTK. "
+-# "On Ubuntu, you could install it using 'sudo apt-get libwrap0'")
+-# ENDIF()
+-# ENDIF()
+-
+- SET(CMAKE_THREAD_LIBS_INIT)
+- IF(DCMTK_oflog_LIBRARY)
+- # Hack - Not having a DCMTKConfig.cmake file to read the settings from, we will attempt to
+- # find the library in all cases.
+- # Ideally, pthread library should be discovered only if DCMTK_WITH_THREADS is enabled.
+- SET(CMAKE_THREAD_PREFER_PTHREAD TRUE)
+- FIND_PACKAGE(Threads)
+- ENDIF()
+-
+- SET( DCMTK_FOUND "YES" )
+- SET( DCMTK_INCLUDE_DIR
+- ${DCMTK_DIR}/include
+- ${DCMTK_config_INCLUDE_DIR}
++if(DCMTK_ofstd_INCLUDE_DIR)
++ get_filename_component(DCMTK_dcmtk_INCLUDE_DIR
+ ${DCMTK_ofstd_INCLUDE_DIR}
+- ${DCMTK_oflog_INCLUDE_DIR}
+- ${DCMTK_dcmdata_INCLUDE_DIR}
+- ${DCMTK_dcmjpeg_INCLUDE_DIR}
+- ${DCMTK_dcmnet_INCLUDE_DIR}
+- ${DCMTK_dcmimgle_INCLUDE_DIR}
+- ${DCMTK_dcmimage_INCLUDE_DIR}
+- )
+-
+- SET( DCMTK_LIBRARIES
+- ${DCMTK_dcmimage_LIBRARY}
+- ${DCMTK_dcmimgle_LIBRARY}
+- ${DCMTK_dcmnet_LIBRARY}
+- ${DCMTK_dcmjpeg_LIBRARY}
+- ${DCMTK_dcmdata_LIBRARY}
+- ${DCMTK_ijg8_LIBRARY}
+- ${DCMTK_ijg12_LIBRARY}
+- ${DCMTK_ijg16_LIBRARY}
+- ${DCMTK_oflog_LIBRARY}
+- ${DCMTK_ofstd_LIBRARY}
+- ${DCMTK_config_LIBRARY}
+- ${CMAKE_THREAD_LIBS_INIT}
+- )
+-
+- IF(DCMTK_imagedb_LIBRARY)
+- SET( DCMTK_LIBRARIES
+- ${DCMTK_LIBRARIES}
+- ${DCMTK_imagedb_LIBRARY}
+- )
+- ENDIF(DCMTK_imagedb_LIBRARY)
+-
+- IF( WIN32 )
+- SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} ws2_32 netapi32 wsock32)
+- ENDIF( WIN32 )
+-
+-# IF (NOT WIN32)
+-# SET( DCMTK_LIBRARIES ${DCMTK_LIBRARIES} ${DCMTK_wrap_LIBRARY} )
+-# ENDIF()
+-
+-ENDIF()
+-
+-FIND_PROGRAM(DCMTK_DCMDUMP_EXECUTABLE dcmdump
+- PATHS
+- ${DCMTK_DIR}/bin
+- NO_DEFAULT_PATH
+- )
+-
+-FIND_PROGRAM(DCMTK_DCMDJPEG_EXECUTABLE dcmdjpeg
+- PATHS
+- ${DCMTK_DIR}/bin
+- NO_DEFAULT_PATH
+- )
+-
+-FIND_PROGRAM(DCMTK_DCMDRLE_EXECUTABLE dcmdrle
+- PATHS
+- ${DCMTK_DIR}/bin
+- NO_DEFAULT_PATH
+- )
+-
+-FIND_PROGRAM(DCMTK_DCMQRSCP_EXECUTABLE dcmqrscp
+- PATHS
+- ${DCMTK_DIR}/bin
+- NO_DEFAULT_PATH
+- )
+-
+-FIND_PROGRAM(DCMTK_STORESCU_EXECUTABLE storescu
+- PATHS
+- ${DCMTK_DIR}/bin
+- NO_DEFAULT_PATH
+- )
+-
+-MARK_AS_ADVANCED(
+- DCMTK_DCMDUMP_EXECUTABLE
+- DCMTK_DCMDJPEG_EXECUTABLE
+- DCMTK_DCMDRLE_EXECUTABLE
+- DCMTK_DCMQRSCP_EXECUTABLE
+- DCMTK_STORESCU_EXECUTABLE
++ PATH
++ CACHE)
++ list(APPEND DCMTK_INCLUDE_DIRS ${DCMTK_dcmtk_INCLUDE_DIR})
++ mark_as_advanced(DCMTK_dcmtk_INCLUDE_DIR)
++endif()
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(DCMTK DEFAULT_MSG
+ DCMTK_config_INCLUDE_DIR
++ DCMTK_ofstd_INCLUDE_DIR
++ DCMTK_ofstd_LIBRARY
+ DCMTK_dcmdata_INCLUDE_DIR
+ DCMTK_dcmdata_LIBRARY
+- DCMTK_dcmnet_INCLUDE_DIR
+- DCMTK_dcmnet_LIBRARY
+ DCMTK_dcmimgle_INCLUDE_DIR
+- DCMTK_dcmimgle_LIBRARY
+- DCMTK_dcmimage_INCLUDE_DIR
+- DCMTK_dcmimage_LIBRARY
+- DCMTK_imagedb_LIBRARY
+- DCMTK_ofstd_INCLUDE_DIR
+- DCMTK_ofstd_LIBRARY
+- DCMTK_oflog_INCLUDE_DIR
+- DCMTK_oflog_LIBRARY
+- )
++ DCMTK_dcmimgle_LIBRARY)
++
++# Compatibility: This variable is deprecated
++set(DCMTK_INCLUDE_DIR ${DCMTK_INCLUDE_DIRS})
+
++foreach(executable dcmdump dcmdjpeg dcmdrle)
++ string(TOUPPER ${executable} EXECUTABLE)
++ find_program(DCMTK_${EXECUTABLE}_EXECUTABLE ${executable} ${DCMTK_DIR}/bin)
++ mark_as_advanced(DCMTK_${EXECUTABLE}_EXECUTABLE)
++endforeach()
Modified: trunk/packages/ctk/debian/patches/series
===================================================================
--- trunk/packages/ctk/debian/patches/series 2011-09-04 12:16:25 UTC (rev 7655)
+++ trunk/packages/ctk/debian/patches/series 2011-09-04 12:57:55 UTC (rev 7656)
@@ -2,3 +2,4 @@
debian-changes-0.1.0-3
fixvtk.patch
fixdcmtk.patch
+debian-changes-0.1.0~git622a40d-1
Modified: trunk/packages/ctk/debian/rules
===================================================================
--- trunk/packages/ctk/debian/rules 2011-09-04 12:16:25 UTC (rev 7655)
+++ trunk/packages/ctk/debian/rules 2011-09-04 12:57:55 UTC (rev 7656)
@@ -15,7 +15,7 @@
-DCTK_LIB_ImageProcessing/ITK/Core:BOOL=ON \
-DCTK_LIB_DICOM/Core:BOOL=ON \
-DCTK_LIB_Widgets:BOOL=ON \
- -DCTK_LIB_Scripting/Python/Core:BOOL=ON \
+ -DCTK_LIB_Scripting/Python/Core:BOOL=OFF \
-DCTK_LIB_Visualization/VTK/Core:BOOL=ON \
-DCTK_SUPERBUILD:BOOL=OFF \
@@ -41,6 +41,5 @@
# doxygen $(DEB_BUILDDIR)/doxygen.config
# dh_install -plibctk-doc $(DEB_BUILDDIR)/Documents/Doxygen/html usr/share/doc/ctk-doc
-
get-orig-source:
/bin/sh $(CURDIR)/debian/get-orig-source
More information about the debian-med-commit
mailing list