--- /dev/null
+From 0465f8ceab739a0f096c97c31d43a934a6617099 Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mrceresa@gmail.com>
+Date: Sun, 20 Mar 2011 12:52:41 +0100
+Subject: [PATCH 1/6] Added soname information for all targets
+
+---
+ CMakeLists.txt | 25 +++++++++++++++++++++++--
+ 1 files changed, 23 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 446d478..62e7a6f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,12 +20,21 @@ SET(DCMTK_MODULES config ofstd oflog dcmdata dcmimgle dcmjpeg dcmimage dcmtls dc
+ SET(DCMTK_PACKAGE_NAME "dcmtk")
+ SET(DCMTK_PACKAGE_DATE "2011-01-06")
+ #SET(DCMTK_PACKAGE_TARNAME "dcmtk-3.6.0")
+-SET(DCMTK_PACKAGE_VERSION "3.6.0")
+-SET(DCMTK_PACKAGE_VERSION_NUMBER "360")
++#SET(DCMTK_PACKAGE_VERSION "3.6.0")
++#SET(DCMTK_PACKAGE_VERSION_NUMBER "360")
+ SET(DCMTK_PACKAGE_VERSION_SUFFIX "")
+ #SET(DCMTK_PACKAGE_STRING "dcmtk 3.6.0")
+ #SET(DCMTK_PACKAGE_BUGREPORT "dicom-bugs@offis.de")
+
++SET(DCMTK_MAJOR_VERSION 3)
++SET(DCMTK_MINOR_VERSION 6)
++SET(DCMTK_BUILD_VERSION 0)
++SET(DCMTK_PACKAGE_VERSION "${DCMTK_MAJOR_VERSION}.${DCMTK_MINOR_VERSION}.${DCMTK_BUILD_VERSION}")
++SET(DCMTK_API_VERSION "${DCMTK_MAJOR_VERSION}.${DCMTK_MINOR_VERSION}")
++SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_API_VERSION}")
++SET(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_MAJOR_VERSION}${DCMTK_MINOR_VERSION}${DCMTK_BUILD_VERSION})
++
++
+ # DCMTK build options
+ OPTION(DCMTK_WITH_TIFF "Configure DCMTK with support for TIFF" ON)
+ OPTION(DCMTK_WITH_PNG "Configure DCMTK with support for PNG" ON)
+@@ -295,6 +304,18 @@ ENDIF(WITH_THREADS)
+ # Recurse into subdirectories
+ FOREACH(module ${DCMTK_MODULES})
+ ADD_SUBDIRECTORY(${module})
++
++# for each shared lib add proper soname information
++ IF(BUILD_SHARED_LIBS)
++ IF(${module} MATCHES config)
++ # Skip config module
++ ELSEIF(${module} MATCHES doxygen)
++ # Skip doxygen module
++ ELSE(${module} MATCHES config)
++ SET_TARGET_PROPERTIES(${module} PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
++ ENDIF(${module} MATCHES config)
++ ENDIF(BUILD_SHARED_LIBS)
++
+ ENDFOREACH(module)
+
+ #-----------------------------------------------------------------------------
+--
+1.7.4
+
--- /dev/null
+From 8401d7914ef110d5aca35bf7e1409341c533f1e4 Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mrceresa@gmail.com>
+Date: Sun, 20 Mar 2011 12:54:16 +0100
+Subject: [PATCH 2/6] Install libs in the correct arch dir
+
+---
+ CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 62e7a6f..86b7601 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,7 +82,7 @@ INCLUDE_DIRECTORIES(${DCMTK_INCLUDE_DIR})
+
+ SET(INSTALL_BINDIR "/bin")
+ SET(INSTALL_INCDIR "/include")
+-SET(INSTALL_LIBDIR "/lib")
++SET(INSTALL_LIBDIR "/lib${LIB_SUFFIX}")
+ SET(INSTALL_ETCDIR "/etc/dcmtk")
+ SET(INSTALL_DATDIR "/share/dcmtk")
+ SET(INSTALL_DOCDIR "/share/doc/dcmtk")
+--
+1.7.4
+
--- /dev/null
+From 066d61eaecdf0731be99782649340ed141b1d1be Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mrceresa@gmail.com>
+Date: Sun, 20 Mar 2011 13:11:54 +0100
+Subject: [PATCH 3/6] Removed bundled libcharl reference in dcmjpls
+
+---
+ dcmjpls/CMakeLists.txt | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dcmjpls/CMakeLists.txt b/dcmjpls/CMakeLists.txt
+index d89eedf..a6faf10 100644
+--- a/dcmjpls/CMakeLists.txt
++++ b/dcmjpls/CMakeLists.txt
+@@ -2,4 +2,4 @@
+ PROJECT(dcmjpls)
+
+ # recurse into subdirectories
+-SUBDIRS(libsrc libcharls apps include/dcmtk/dcmjpls)
++SUBDIRS(libsrc apps include/dcmtk/dcmjpls)
+--
+1.7.4
+
--- /dev/null
+From c20efddd5eee01bb5db0aeaac8fc0b64abf6d6cf Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mrceresa@gmail.com>
+Date: Sun, 20 Mar 2011 14:27:14 +0100
+Subject: [PATCH 4/6] Use system charls
+
+---
+ CMake/3rdparty.cmake | 17 +++++++++++++++++
+ CMake/FindCharLS.cmake | 34 ++++++++++++++++++++++++++++++++++
+ CMakeLists.txt | 1 +
+ dcmjpls/apps/CMakeLists.txt | 2 +-
+ dcmjpls/libsrc/CMakeLists.txt | 2 +-
+ 5 files changed, 54 insertions(+), 2 deletions(-)
+ create mode 100644 CMake/FindCharLS.cmake
+
+diff --git a/CMake/3rdparty.cmake b/CMake/3rdparty.cmake
+index 74ce78f..36956ce 100755
+--- a/CMake/3rdparty.cmake
++++ b/CMake/3rdparty.cmake
+@@ -197,6 +197,23 @@ ELSE(WIN32)
+ SET(WITH_ZLIB 1)
+ ENDIF(NOT ZLIB_LIBS)
+ ENDIF(DCMTK_WITH_ZLIB)
++
++ # Find charls
++
++ SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/CMake)
++
++ IF(DCMTK_WITH_CHARLS)
++ FIND_PACKAGE(CharLS)
++ INCLUDE_DIRECTORIES(${CHARLS_INCLUDE_DIRS})
++ SET(CHARLS_LIBS ${CHARLS_LIBRARIES})
++ IF (NOT CHARLS_LIBS)
++ MESSAGE(STATUS "Warning: CharLS not found. Cannot build!")
++ ELSE(NOT CHARLS_LIBS)
++ MESSAGE(STATUS "Info: DCMTK CHARLS support will be enabled")
++ SET(WITH_CHARLS 1)
++ ENDIF(NOT CHARLS_LIBS)
++ ENDIF(DCMTK_WITH_CHARLS)
++
+
+ ENDIF(WIN32)
+
+diff --git a/CMake/FindCharLS.cmake b/CMake/FindCharLS.cmake
+new file mode 100644
+index 0000000..eaa45b7
+--- /dev/null
++++ b/CMake/FindCharLS.cmake
+@@ -0,0 +1,34 @@
++FIND_PATH(CHARLS_INCLUDE_DIR CharLS/interface.h
++/usr/local/include
++/usr/include
++)
++
++FIND_LIBRARY(CHARLS_LIBRARY
++ NAMES CharLS
++ PATHS /usr/lib /usr/local/lib /usr/lib64 /usr/local/lib64
++ )
++
++
++IF (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)
++ SET(CHARLS_LIBRARIES ${CHARLS_LIBRARY})
++ SET(CHARLS_INCLUDE_DIRS ${CHARLS_INCLUDE_DIR})
++ SET(CHARLS_FOUND "YES")
++ELSE (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)
++ SET(CHARLS_FOUND "NO")
++ENDIF (CHARLS_LIBRARY AND CHARLS_INCLUDE_DIR)
++
++
++IF (CHARLS_FOUND)
++ IF (NOT CHARLS_FIND_QUIETLY)
++ MESSAGE(STATUS "Found CHARLS: ${CHARLS_LIBRARIES}")
++ ENDIF (NOT CHARLS_FIND_QUIETLY)
++ELSE (CHARLS_FOUND)
++ IF (CHARLS_FIND_REQUIRED)
++ MESSAGE(FATAL_ERROR "Could not find CHARLS library")
++ ENDIF (CHARLS_FIND_REQUIRED)
++ENDIF (CHARLS_FOUND)
++
++MARK_AS_ADVANCED(
++ CHARLS_LIBRARIES
++ CHARLS_INCLUDE_DIR
++ )
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 86b7601..fa5d9ad 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,6 +36,7 @@ SET(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_MAJOR_VERSION}${DCMTK_MINOR_VERSION}${D
+
+
+ # DCMTK build options
++OPTION(DCMTK_WITH_CHARLS "Configure DCMTK with support for CHARLS" ON)
+ OPTION(DCMTK_WITH_TIFF "Configure DCMTK with support for TIFF" ON)
+ OPTION(DCMTK_WITH_PNG "Configure DCMTK with support for PNG" ON)
+ OPTION(DCMTK_WITH_XML "Configure DCMTK with support for XML" OFF)
+diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
+index d993bc2..45abcb9 100644
+--- a/dcmjpls/apps/CMakeLists.txt
++++ b/dcmjpls/apps/CMakeLists.txt
+@@ -16,6 +16,6 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd ${ZLIB_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
++ TARGET_LINK_LIBRARIES(${PROGRAM} dcmjpls ${CHARLS_LIBS} dcmimage dcmimgle dcmdata oflog ofstd ofstd ${ZLIB_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
+ ENDFOREACH(PROGRAM)
+ TARGET_LINK_LIBRARIES(dcml2pnm ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
+diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
+index 63a2766..9499dd8 100644
+--- a/dcmjpls/libsrc/CMakeLists.txt
++++ b/dcmjpls/libsrc/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # declare additional include directories
+-INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpls_SOURCE_DIR}/libcharls ${ZLIB_INCDIR})
++INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${CHARLS_INCLUDE_DIRS} ${ZLIB_INCDIR})
+
+ # create library from source files
+ ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
+--
+1.7.4
+
--- /dev/null
+From 6d6a52c1c049c0fe8440d8b03d5cb852a47c0cd5 Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mrceresa@gmail.com>
+Date: Sun, 20 Mar 2011 14:40:48 +0100
+Subject: [PATCH 5/6] Fixed includes for CharLS 1.0
+
+---
+ dcmjpls/libsrc/djcodecd.cc | 2 +-
+ dcmjpls/libsrc/djcodece.cc | 2 +-
+ dcmjpls/libsrc/djerror.h | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/dcmjpls/libsrc/djcodecd.cc b/dcmjpls/libsrc/djcodecd.cc
+index 8a11515..8da8d7a 100644
+--- a/dcmjpls/libsrc/djcodecd.cc
++++ b/dcmjpls/libsrc/djcodecd.cc
+@@ -44,7 +44,7 @@
+ #include "djerror.h" /* for private class DJLSError */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ E_TransferSyntax DJLSLosslessDecoder::supportedTransferSyntax() const
+ {
+diff --git a/dcmjpls/libsrc/djcodece.cc b/dcmjpls/libsrc/djcodece.cc
+index 9d6e1d8..8148b31 100644
+--- a/dcmjpls/libsrc/djcodece.cc
++++ b/dcmjpls/libsrc/djcodece.cc
+@@ -62,7 +62,7 @@
+ #include "dcmtk/dcmimgle/dcmimage.h" /* for class DicomImage */
+
+ // JPEG-LS library (CharLS) includes
+-#include "intrface.h"
++#include "CharLS/interface.h"
+
+ BEGIN_EXTERN_C
+ #ifdef HAVE_FCNTL_H
+diff --git a/dcmjpls/libsrc/djerror.h b/dcmjpls/libsrc/djerror.h
+index 68ebae1..d3cd2ad 100644
+--- a/dcmjpls/libsrc/djerror.h
++++ b/dcmjpls/libsrc/djerror.h
+@@ -31,7 +31,7 @@
+
+ #include "dcmtk/config/osconfig.h"
+ #include "dcmtk/dcmjpls/djlsutil.h" /* For the OFCondition codes */
+-#include "intrface.h" /* CharLS include */
++#include "CharLS/interface.h" /* CharLS include */
+
+ /** Helper class for converting between dcmjpls and CharLS error codes
+ */
+--
+1.7.4
+
--- /dev/null
+From d3284cf35b8d92029cba487a285cdd6aeee16d38 Mon Sep 17 00:00:00 2001
+From: Joerg Riesmeier <dicom@offis.de>
+Date: Tue, 1 Feb 2011 09:52:35 +0000
+Subject: [PATCH 6/6] Added optional support for building shared libraries with CMake.
+
+---
+ CMakeLists.txt | 2 ++
+ dcmimage/apps/CMakeLists.txt | 3 +--
+ dcmimgle/apps/CMakeLists.txt | 3 +--
+ dcmjpeg/apps/CMakeLists.txt | 5 ++---
+ dcmjpls/apps/CMakeLists.txt | 3 +--
+ dcmpstat/apps/CMakeLists.txt | 8 +-------
+ dcmqrdb/apps/CMakeLists.txt | 4 ++--
+ dcmwlm/apps/CMakeLists.txt | 4 ++--
+ 8 files changed, 12 insertions(+), 20 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fa5d9ad..010c13c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -34,6 +34,8 @@ SET(DCMTK_API_VERSION "${DCMTK_MAJOR_VERSION}.${DCMTK_MINOR_VERSION}")
+ SET(DCMTK_LIBRARY_PROPERTIES VERSION "${DCMTK_PACKAGE_VERSION}" SOVERSION "${DCMTK_API_VERSION}")
+ SET(DCMTK_PACKAGE_VERSION_NUMBER ${DCMTK_MAJOR_VERSION}${DCMTK_MINOR_VERSION}${DCMTK_BUILD_VERSION})
+
++# General build options
++OPTION(BUILD_SHARED_LIBS "Build with shared libraries." OFF)
+
+ # DCMTK build options
+ OPTION(DCMTK_WITH_CHARLS "Configure DCMTK with support for CHARLS" ON)
+diff --git a/dcmimage/apps/CMakeLists.txt b/dcmimage/apps/CMakeLists.txt
+index aad94cf..d3f241f 100644
+--- a/dcmimage/apps/CMakeLists.txt
++++ b/dcmimage/apps/CMakeLists.txt
+@@ -13,6 +13,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcm2pnm dcmquant dcmscale)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmimage dcmimgle dcmdata oflog ofstd ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
++ TARGET_LINK_LIBRARIES(${PROGRAM} dcmimage dcmimgle dcmdata oflog ofstd ${LIBTIFF_LIBS} ${LIBPNG_LIBS} ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
+ ENDFOREACH(PROGRAM)
+-TARGET_LINK_LIBRARIES(dcm2pnm ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
+diff --git a/dcmimgle/apps/CMakeLists.txt b/dcmimgle/apps/CMakeLists.txt
+index 8514a47..440b321 100644
+--- a/dcmimgle/apps/CMakeLists.txt
++++ b/dcmimgle/apps/CMakeLists.txt
+@@ -13,6 +13,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmdspfn dcod2lum dconvlum)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmimgle oflog ofstd ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
++ TARGET_LINK_LIBRARIES(${PROGRAM} dcmimgle dcmdata oflog ofstd ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
+ ENDFOREACH(PROGRAM)
+-TARGET_LINK_LIBRARIES(dcmdspfn dcmdata)
+diff --git a/dcmjpeg/apps/CMakeLists.txt b/dcmjpeg/apps/CMakeLists.txt
+index 9c1f565..b9bc30b 100644
+--- a/dcmjpeg/apps/CMakeLists.txt
++++ b/dcmjpeg/apps/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ INCLUDE_DIRECTORIES(${dcmjpeg_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${oflog_SOURCE_DIR}/include ${dcmdata_SOURCE_DIR}/include ${dcmimgle_SOURCE_DIR}/include ${dcmimage_SOURCE_DIR}/include ${dcmjpeg_SOURCE_DIR}/libijg8 ${dcmjpeg_SOURCE_DIR}/libijg12 ${dcmjpeg_SOURCE_DIR}/libijg16 ${ZLIB_INCDIR} ${LIBTIFF_INCDIR} ${LIBPNG_INCDIR})
+
+ # declare directories containing used libraries
+-LINK_DIRECTORIES(${dcmjpeg_BINARY_DIR} ${ofstd_BINARY_DIR} ${oflog_BINARY_DIR} ${dcmdata_BINARY_DIR} ${dcmimgle_BINARY_DIR} ${dcmimage_BINARY_DIR} ${ZLIB_LIBDIR} ${LIBTIFF_LIBDIR} ${LIBPNG_LIBDIR})
++LINK_DIRECTORIES(${dcmjpeg_BINARY_DIR} ${ofstd_BINARY_DIR} ${oflog_BINARY_DIR} ${dcmdata_BINARY_DIR} ${dcmimgle_BINARY_DIR} ${dcmimage_BINARY_DIR} ${ZLIB_LIBDIR} ${LIBTIFF_LIBDIR} ${LIBPNG_LIBDIR})
+
+ # declare executables
+ FOREACH(PROGRAM dcmcjpeg dcmdjpeg dcmj2pnm dcmmkdir)
+@@ -16,6 +16,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmcjpeg dcmdjpeg dcmj2pnm dcmmkdir)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmjpeg ijg8 ijg12 ijg16 dcmimage dcmimgle dcmdata oflog ofstd ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
++ TARGET_LINK_LIBRARIES(${PROGRAM} dcmjpeg ijg8 ijg12 ijg16 dcmimage dcmimgle dcmdata oflog ofstd ${LIBTIFF_LIBS} ${LIBPNG_LIBS} ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
+ ENDFOREACH(PROGRAM)
+-TARGET_LINK_LIBRARIES(dcmj2pnm ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
+diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
+index 45abcb9..41fc329 100644
+--- a/dcmjpls/apps/CMakeLists.txt
++++ b/dcmjpls/apps/CMakeLists.txt
+@@ -16,6 +16,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmjpls ${CHARLS_LIBS} dcmimage dcmimgle dcmdata oflog ofstd ofstd ${ZLIB_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
++ TARGET_LINK_LIBRARIES(${PROGRAM} dcmjpls ${CHARLS_LIBS} dcmimage dcmimgle dcmdata oflog ofstd ofstd ${LIBTIFF_LIBS} ${LIBPNG_LIBS} ${ZLIB_LIBS} ${THREAD_LIBS} ${WIN32_STD_LIBRARIES})
+ ENDFOREACH(PROGRAM)
+-TARGET_LINK_LIBRARIES(dcml2pnm ${LIBTIFF_LIBS} ${LIBPNG_LIBS})
+diff --git a/dcmpstat/apps/CMakeLists.txt b/dcmpstat/apps/CMakeLists.txt
+index e795197..48398a8 100644
+--- a/dcmpstat/apps/CMakeLists.txt
++++ b/dcmpstat/apps/CMakeLists.txt
+@@ -17,11 +17,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmmkcrv dcmmklut dcmp2pgm dcmprscp dcmprscu dcmpsmk dcmpschk dcmpsprt dcmpsrcv dcmpssnd)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmpstat dcmimgle dcmqrdb dcmnet dcmdata oflog ofstd ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
+-ENDFOREACH(PROGRAM)
+-FOREACH(PROGRAM dcmmklut dcmp2pgm dcmprscp dcmprscu dcmpschk dcmpsmk dcmpsprt dcmpsrcv dcmpssnd)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmsr)
+-ENDFOREACH(PROGRAM)
+-FOREACH(PROGRAM dcmp2pgm dcmprscp dcmprscu dcmpsprt dcmpsrcv dcmpssnd)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmtls dcmdsig ${LIBXML_LIBS} ${OPENSSL_LIBS})
++ TARGET_LINK_LIBRARIES(${PROGRAM} dcmpstat dcmdsig dcmsr dcmimgle dcmqrdb dcmnet dcmtls dcmdata oflog ofstd ${LIBXML_LIBS} ${OPENSSL_LIBS} ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
+ ENDFOREACH(PROGRAM)
+diff --git a/dcmqrdb/apps/CMakeLists.txt b/dcmqrdb/apps/CMakeLists.txt
+index 249732c..6be0507 100644
+--- a/dcmqrdb/apps/CMakeLists.txt
++++ b/dcmqrdb/apps/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ # declare directories containing used libraries
+-LINK_DIRECTORIES(${dcmqrdb_BINARY_DIR} ${ofstd_BINARY_DIR} ${oflog_BINARY_DIR} ${dcmdata_BINARY_DIR} ${dcmnet_BINARY_DIR} ${ZLIB_LIBDIR})
++LINK_DIRECTORIES(${dcmqrdb_BINARY_DIR} ${ofstd_BINARY_DIR} ${oflog_BINARY_DIR} ${dcmdata_BINARY_DIR} ${dcmnet_BINARY_DIR} ${ZLIB_LIBDIR} ${OPENSSL_LIBDIR})
+
+ # declare executables
+ FOREACH(PROGRAM dcmqrscp dcmqridx dcmqrti)
+@@ -13,5 +13,5 @@ ENDFOREACH(PROGRAM)
+
+ # make sure executables are linked to the corresponding libraries
+ FOREACH(PROGRAM dcmqrscp dcmqridx dcmqrti)
+- TARGET_LINK_LIBRARIES(${PROGRAM} dcmqrdb dcmnet dcmdata oflog ofstd ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
++ TARGET_LINK_LIBRARIES(${PROGRAM} dcmqrdb dcmnet dcmdata oflog ofstd ${OPENSSL_LIBS} ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
+ ENDFOREACH(PROGRAM)
+diff --git a/dcmwlm/apps/CMakeLists.txt b/dcmwlm/apps/CMakeLists.txt
+index 445881f..13865ca 100644
+--- a/dcmwlm/apps/CMakeLists.txt
++++ b/dcmwlm/apps/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ INCLUDE_DIRECTORIES(${dcmtls_SOURCE_DIR}/include)
+
+ # declare directories containing used libraries
+-LINK_DIRECTORIES(${dcmwlm_BINARY_DIR} ${ofstd_BINARY_DIR} ${oflog_BINARY_DIR} ${dcmdata_BINARY_DIR} ${dcmtls_BINARY_DIR} ${dcmnet_BINARY_DIR} ${ZLIB_LIBDIR})
++LINK_DIRECTORIES(${dcmwlm_BINARY_DIR} ${ofstd_BINARY_DIR} ${oflog_BINARY_DIR} ${dcmdata_BINARY_DIR} ${dcmtls_BINARY_DIR} ${dcmnet_BINARY_DIR} ${ZLIB_LIBDIR} ${OPENSSL_LIBDIR})
+
+ # declare executables
+ ADD_EXECUTABLE(wlmscpfs wlmscpfs wlcefs)
+@@ -11,4 +11,4 @@ ADD_EXECUTABLE(wlmscpfs wlmscpfs wlcefs)
+ INSTALL_TARGETS(${INSTALL_BINDIR} wlmscpfs)
+
+ # make sure executables are linked to the corresponding libraries
+-TARGET_LINK_LIBRARIES(wlmscpfs dcmwlm dcmnet dcmtls dcmdata oflog ofstd ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
++TARGET_LINK_LIBRARIES(wlmscpfs dcmwlm dcmnet dcmtls dcmdata oflog ofstd ${OPENSSL_LIBS} ${ZLIB_LIBS} ${WIN32_STD_LIBRARIES} ${THREAD_LIBS})
+--
+1.7.4
+
--- /dev/null
+From 13f216a9ab2c93041cf18283ca4726c3c2e876d9 Mon Sep 17 00:00:00 2001
+From: Mario Ceresa <mrceresa@gmail.com>
+Date: Tue, 22 Mar 2011 18:06:54 +0100
+Subject: [PATCH] Add soname generation for modules which are not in DCMTK_MODULES variable
+
+---
+ CMakeLists.txt | 9 +++++++++
+ 1 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 010c13c..01e6287 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -304,6 +304,7 @@ ENDIF(WITH_THREADS)
+ # Start actual compilation tasks
+ #-----------------------------------------------------------------------------
+
++
+ # Recurse into subdirectories
+ FOREACH(module ${DCMTK_MODULES})
+ ADD_SUBDIRECTORY(${module})
+@@ -321,6 +322,14 @@ FOREACH(module ${DCMTK_MODULES})
+
+ ENDFOREACH(module)
+
++# Set target properties for modules which are not in DCMTK_MODULE
++SET_TARGET_PROPERTIES(dcmdsig PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(ijg12 PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(ijg16 PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(ijg8 PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(libi2d PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
++
++
+ #-----------------------------------------------------------------------------
+ # Installation tasks
+ #-----------------------------------------------------------------------------
+--
+1.7.4
+
--- /dev/null
+--- dcmtk-3.6.0/CMake/GenerateDCMTKConfigure.cmake.orig 2010-12-20 13:50:53.000000000 +0100
++++ dcmtk-3.6.0/CMake/GenerateDCMTKConfigure.cmake 2012-02-24 19:16:43.263102766 +0100
+@@ -60,7 +60,7 @@
+ SET(DCM_DICT_DEFAULT_PATH "${DCM_DICT_DEFAULT_PATH}${ENVIRONMENT_PATH_SEPARATOR}${DCMTK_PREFIX}${INSTALL_DATDIR}${PATH_SEPARATOR}private.dic")
+ ENDIF(WITH_PRIVATE_TAGS)
+ # Set default directory for configuration and support data.
+- SET(DCMTK_DEFAULT_CONFIGURATION_DIR "${DCMTK_PREFIX}${INSTALL_ETCDIR}${PATH_SEPARATOR}")
++ SET(DCMTK_DEFAULT_CONFIGURATION_DIR "${INSTALL_ETCDIR}${PATH_SEPARATOR}")
+ SET(DCMTK_DEFAULT_SUPPORT_DATA_DIR "${DCMTK_PREFIX}${INSTALL_DATDIR}${PATH_SEPARATOR}")
+ ENDIF(WIN32 AND NOT CYGWIN AND NOT MINGW)
+
+--- dcmtk-3.6.0/dcmnet/etc/CMakeLists.txt.orig 2005-09-15 10:15:05.000000000 +0200
++++ dcmtk-3.6.0/dcmnet/etc/CMakeLists.txt 2012-02-24 20:27:25.439911474 +0100
+@@ -1,2 +1,2 @@
+ # declare installation files
+-INSTALL_FILES(${INSTALL_ETCDIR} .cfg)
++INSTALL(FILES storescp.cfg storescu.cfg DESTINATION ${INSTALL_ETCDIR})
+--- dcmtk-3.6.0/dcmpstat/etc/CMakeLists.txt.orig 2005-09-15 10:17:44.000000000 +0200
++++ dcmtk-3.6.0/dcmpstat/etc/CMakeLists.txt 2012-02-24 20:28:25.083246806 +0100
+@@ -1,2 +1,2 @@
+ # declare installation files
+-INSTALL_FILES(${INSTALL_ETCDIR} .cfg)
++INSTALL(FILES dcmpstat.cfg printers.cfg DESTINATION ${INSTALL_ETCDIR})
+--- dcmtk-3.6.0/dcmqrdb/etc/CMakeLists.txt.orig 2005-09-15 10:19:37.000000000 +0200
++++ dcmtk-3.6.0/dcmqrdb/etc/CMakeLists.txt 2012-02-24 20:29:10.269914985 +0100
+@@ -1,2 +1,2 @@
+ # declare installation files
+-INSTALL_FILES(${INSTALL_ETCDIR} .cfg)
++INSTALL(FILES dcmqrscp.cfg DESTINATION ${INSTALL_ETCDIR})
+--- dcmtk-3.6.0/oflog/etc/CMakeLists.txt.orig 2009-08-19 13:52:17.000000000 +0200
++++ dcmtk-3.6.0/oflog/etc/CMakeLists.txt 2012-02-24 20:30:32.356584400 +0100
+@@ -1,2 +1,2 @@
+ # declare installation files
+-INSTALL_FILES(${INSTALL_ETCDIR} .cfg)
++INSTALL(FILES filelog.cfg logger.cfg DESTINATION ${INSTALL_ETCDIR})
--- /dev/null
+--- dcmtk-3.6.0/CMakeLists.txt.orig 2012-02-23 20:00:46.253631605 +0100
++++ dcmtk-3.6.0/CMakeLists.txt 2012-02-23 20:48:54.923728329 +0100
+@@ -327,7 +327,7 @@
+ SET_TARGET_PROPERTIES(ijg12 PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
+ SET_TARGET_PROPERTIES(ijg16 PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
+ SET_TARGET_PROPERTIES(ijg8 PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
+-SET_TARGET_PROPERTIES(libi2d PROPERTIES ${DCMTK_LIBRARY_PROPERTIES})
++SET_TARGET_PROPERTIES(libi2d PROPERTIES ${DCMTK_LIBRARY_PROPERTIES} OUTPUT_NAME "i2d")
+
+
+ #-----------------------------------------------------------------------------
--- /dev/null
+--- dcmtk-3.6.0/ofstd/libsrc/CMakeLists.txt.orig 2009-12-21 16:06:18.000000000 +0100
++++ dcmtk-3.6.0/ofstd/libsrc/CMakeLists.txt 2012-02-23 17:17:52.666637685 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(ofstd ofcmdln ofconapp ofcond ofconfig ofconsol ofcrc32 ofdate ofdatime offname oflist ofstd ofstring ofthread oftime)
+
++TARGET_LINK_LIBRARIES(ofstd pthread)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} ofstd)
+--- dcmtk-3.6.0/oflog/libsrc/CMakeLists.txt.orig 2010-12-08 14:19:02.000000000 +0100
++++ dcmtk-3.6.0/oflog/libsrc/CMakeLists.txt 2012-02-23 17:17:26.399970139 +0100
+@@ -8,5 +8,7 @@
+
+ ADD_LIBRARY(oflog oflog apndimpl appender config consap factory fileap filter globinit hierarchy hierlock layout logger logimpl logevent loglevel loglog lloguser ndc ntelogap nullap objreg patlay pointer property rootlog sleep socketap sockbuff socket strhelp syncprims syslogap threads timehelp ${OFLOG_PLATFORM_LIBRARIES})
+
++TARGET_LINK_LIBRARIES(oflog ofstd pthread)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} oflog)
+--- dcmtk-3.6.0/dcmdata/libsrc/CMakeLists.txt.orig 2010-08-27 17:26:01.000000000 +0200
++++ dcmtk-3.6.0/dcmdata/libsrc/CMakeLists.txt 2012-02-23 21:00:35.580418457 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmdata cmdlnarg dcbytstr dcchrstr dccodec dcdatset dcddirif dcdicdir dcdicent dcdict dcdictzz dcdirrec dcelem dcerror dcfilefo dchashdi dcistrma dcistrmb dcistrmf dcistrmz dcitem dclist dcmetinf dcobject dcostrma dcostrmb dcostrmf dcostrmz dcpcache dcpixel dcpixseq dcpxitem dcrleccd dcrlecce dcrlecp dcrledrg dcrleerg dcrlerp dcsequen dcstack dcswap dctag dctagkey dctypes dcuid dcwcache dcvm dcvr dcvrae dcvras dcvrat dcvrcs dcvrda dcvrds dcvrdt dcvrfd dcvrfl dcvris dcvrlo dcvrlt dcvrobow dcvrof dcvrpn dcvrpobw dcvrsh dcvrsl dcvrss dcvrst dcvrtm dcvrui dcvrul dcvrulup dcvrus dcvrut dcxfer dcpath vrscan vrscanl)
+
++TARGET_LINK_LIBRARIES(dcmdata oflog ofstd z)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdata)
+--- dcmtk-3.6.0/dcmdata/libi2d/CMakeLists.txt.orig 2009-07-16 16:25:38.000000000 +0200
++++ dcmtk-3.6.0/dcmdata/libi2d/CMakeLists.txt 2012-02-24 17:16:09.796193895 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(libi2d i2d i2dplvlp i2djpgs i2dbmps i2dplsc i2dplnsc)
+
++TARGET_LINK_LIBRARIES(libi2d dcmdata)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} libi2d)
+--- dcmtk-3.6.0/dcmsign/libsrc/CMakeLists.txt.orig 2005-09-15 10:21:03.000000000 +0200
++++ dcmtk-3.6.0/dcmsign/libsrc/CMakeLists.txt 2012-02-23 19:33:12.730242908 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmdsig dcsignat siautopr sibrsapr sicert sicertvf sicreapr sidsa simaccon simd5 sinullpr siprivat siripemd sirsa sisha1 sisprof sitypes)
+
++TARGET_LINK_LIBRARIES(dcmdsig dcmdata ofstd crypto)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdsig)
+--- dcmtk-3.6.0/dcmimgle/libsrc/CMakeLists.txt.orig 2005-09-15 10:10:03.000000000 +0200
++++ dcmtk-3.6.0/dcmimgle/libsrc/CMakeLists.txt 2012-02-23 21:04:48.253760251 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmimgle dcmimage dibaslut diciefn dicielut didislut didispfn didocu digsdfn digsdlut diimage diinpx diluptab dimo1img dimo2img dimoimg dimoimg3 dimoimg4 dimoimg5 dimomod dimoopx dimopx diovdat diovlay diovlimg diovpln diutils)
+
++TARGET_LINK_LIBRARIES(dcmimgle dcmdata oflog ofstd)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimgle)
+--- dcmtk-3.6.0/dcmimage/libsrc/CMakeLists.txt.orig 2009-11-25 15:40:25.000000000 +0100
++++ dcmtk-3.6.0/dcmimage/libsrc/CMakeLists.txt 2012-02-23 21:05:54.503762469 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmimage diargimg dicmyimg dicoimg dicoopx dicopx dihsvimg dilogger dipalimg dipipng dipitiff diqtctab diqtfs diqthash diqthitl diqtpbox diquant diregist dirgbimg diybrimg diyf2img diyp2img)
+
++TARGET_LINK_LIBRARIES(dcmimage dcmimgle oflog ofstd tiff png)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimage)
+--- dcmtk-3.6.0/dcmnet/libsrc/CMakeLists.txt.orig 2009-12-16 18:02:57.000000000 +0100
++++ dcmtk-3.6.0/dcmnet/libsrc/CMakeLists.txt 2012-02-23 21:08:10.720433697 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmnet assoc cond dcasccff dcasccfg dccfenmp dccfpcmp dccfprmp dccfrsmp dccftsmp dccfuidh dcmlayer dcmtrans dcompat dimcancl dimcmd dimdump dimecho dimfind dimget dimmove dimse dimstore diutil dul dulconst dulextra dulfsm dulparse dulpres extneg lst dfindscu dcuserid scu scp)
+
++TARGET_LINK_LIBRARIES(dcmnet dcmdata oflog ofstd)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmnet)
+--- dcmtk-3.6.0/dcmjpeg/libsrc/CMakeLists.txt.orig 2009-10-07 14:44:33.000000000 +0200
++++ dcmtk-3.6.0/dcmjpeg/libsrc/CMakeLists.txt 2012-02-24 15:13:17.155947032 +0100
+@@ -4,5 +4,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmjpeg ddpiimpl dipijpeg djcodecd djcodece djcparam djdecbas djdecext djdeclol djdecode djdecpro djdecsps djdecsv1 djdijg12 djdijg8 djdijg16 djeijg12 djeijg8 djeijg16 djencbas djencext djenclol djencode djencpro djencsps djencsv1 djrplol djrploss djutils)
+
++TARGET_LINK_LIBRARIES(dcmjpeg dcmimgle ijg8 ijg12 ijg16)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmjpeg)
+--- dcmtk-3.6.0/dcmjpls/libsrc/CMakeLists.txt.orig 2012-02-23 21:11:28.480440318 +0100
++++ dcmtk-3.6.0/dcmjpls/libsrc/CMakeLists.txt 2012-02-24 15:14:53.392616922 +0100
+@@ -4,5 +4,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
+
++TARGET_LINK_LIBRARIES(dcmjpls dcmimgle CharLS)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmjpls)
+--- dcmtk-3.6.0/dcmqrdb/libsrc/CMakeLists.txt.orig 2005-12-16 13:44:35.000000000 +0100
++++ dcmtk-3.6.0/dcmqrdb/libsrc/CMakeLists.txt 2012-02-24 17:48:45.209592704 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmqrdb dcmqrcbf dcmqrcbg dcmqrcbm dcmqrcbs dcmqrcnf dcmqrdbi dcmqrdbs dcmqropt dcmqrptb dcmqrsrv dcmqrtis)
+
++TARGET_LINK_LIBRARIES(dcmqrdb dcmnet)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmqrdb)
+--- dcmtk-3.6.0/dcmsr/libsrc/CMakeLists.txt.orig 2010-11-05 12:06:57.000000000 +0100
++++ dcmtk-3.6.0/dcmsr/libsrc/CMakeLists.txt 2012-02-24 17:13:02.179520948 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmsr dsrcitem dsrcodtn dsrcodvl dsrcomtn dsrcomvl dsrcontn dsrcsidl dsrdattn dsrdoc dsrdoctn dsrdoctr dsrdtitn dsrimgfr dsrimgtn dsrimgvl dsrnumtn dsrnumvl dsrpnmtn dsrreftn dsrscogr dsrsc3gr dsrscotn dsrsc3tn dsrscovl dsrsc3vl dsrsoprf dsrstrvl dsrtcodt dsrtcosp dsrtcotn dsrtcoto dsrtcovl dsrtextn dsrtimtn dsrtncsr dsrtree dsrtypes dsruidtn dsrwavch dsrwavtn dsrwavvl dsrxmlc dsrxmld dsriodcc dsrbascc dsrenhcc dsrcomcc dsrkeycc dsrmamcc dsrchecc dsrcolcc dsrprocc dsrxrdcc dsrspecc dsrmaccc dsrimpcc)
+
++TARGET_LINK_LIBRARIES(dcmsr dcmdata xml2)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmsr)
+--- dcmtk-3.6.0/dcmtls/libsrc/CMakeLists.txt.orig 2010-04-29 18:18:39.000000000 +0200
++++ dcmtk-3.6.0/dcmtls/libsrc/CMakeLists.txt 2012-02-24 15:17:42.772622593 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmtls tlslayer tlstrans tlsscu)
+
++TARGET_LINK_LIBRARIES(dcmtls dcmnet oflog ofstd ssl crypto)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmtls)
+--- dcmtk-3.6.0/dcmwlm/libsrc/CMakeLists.txt.orig 2005-09-15 10:25:33.000000000 +0200
++++ dcmtk-3.6.0/dcmwlm/libsrc/CMakeLists.txt 2012-02-24 17:44:46.996251395 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmwlm wlds wldsfs wlfsim wlmactmg)
+
++TARGET_LINK_LIBRARIES(dcmwlm dcmnet)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmwlm)
+--- dcmtk-3.6.0/dcmpstat/libsrc/CMakeLists.txt.orig 2005-09-15 10:17:54.000000000 +0200
++++ dcmtk-3.6.0/dcmpstat/libsrc/CMakeLists.txt 2012-02-24 18:50:07.069715986 +0100
+@@ -1,5 +1,7 @@
+ # create library from source files
+ ADD_LIBRARY(dcmpstat dcmpstat dviface dvpsab dvpsabl dvpsal dvpsall dvpscf dvpscu dvpscul dvpsda dvpsdal dvpsfs dvpsga dvpsgal dvpsgl dvpsgll dvpsgr dvpsgrl dvpshlp dvpsib dvpsibl dvpsmsg dvpsov dvpsovl dvpspl dvpspl2 dvpspll dvpspr dvpsprt dvpsri dvpsril dvpsrs dvpsrsl dvpssp dvpsspl dvpssv dvpssvl dvpstat dvpstx dvpstxl dvpsvl dvpsvll dvpsvw dvpsvwl dvsighdl)
+
++TARGET_LINK_LIBRARIES(dcmpstat dcmdsig dcmimgle dcmqrdb dcmsr dcmtls)
++
+ # declare installation files
+ INSTALL_TARGETS(${INSTALL_LIBDIR} dcmpstat)
# TODO:
-# - shared libs
-# - use system libjpeg?
-#
-# Conditional build:
-%bcond_without apidocs # do not build and package API docs
+# - use system libjpeg? (8/12/16-bit versions)
#
Summary: DICOM Toolkit - implementation of DICOM/MEDICOM standard
Summary(pl.UTF-8): Narzędzia DICOM - implementacja standardu DICOM/MEDICOM
Source0: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/%{name}-%{version}.tar.gz
# Source0-md5: 19409e039e29a330893caea98715390e
Patch0: %{name}-configure.patch
+Patch1: %{name}-0001-Added-soname-information-for-all-targets.patch
+Patch2: %{name}-0002-Install-libs-in-the-correct-arch-dir.patch
+Patch3: %{name}-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch
+Patch4: %{name}-0004-Use-system-charls.patch
+Patch5: %{name}-0005-Fixed-includes-for-CharLS-1.0.patch
+Patch6: %{name}-0006-Added-optional-support-for-building-shared-libraries.patch
+Patch7: %{name}-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch
+Patch8: %{name}-link.patch
+Patch9: %{name}-libi2d.patch
+Patch10: %{name}-etc.patch
URL: http://dicom.offis.de/dcmtk
+BuildRequires: CharLS-devel
BuildRequires: libpng-devel >= 2:1.2.8
BuildRequires: libstdc++-devel
BuildRequires: libtiff-devel >= 3.7.0
BuildRequires: libxml2-devel >= 1:2.6.26
BuildRequires: openssl-devel >= 0.9.8
BuildRequires: zlib-devel >= 1.2.3
+Requires: %{name}-libs = %{version}-%{release}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Pakiet DICOM ToolKit (DCMTK) to zbiór bibliotek i aplikacji
implementujących część standardu DICOM/MEDICOM.
+%package libs
+Summary: DICOM ToolKit shared libraries
+Summary(pl.UTF-8): Biblioteki współdzielone DICOM
+Group: Libraries
+
+%description libs
+DICOM ToolKit shared libraries.
+
+%description libs -l pl.UTF-8
+Biblioteki współdzielone DICOM.
+
%package devel
Summary: Header files for DCMTK libraries
Summary(pl.UTF-8): Pliki nagłówkowe bibliotek DCMTK
Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
+Requires: %{name}-libs = %{version}-%{release}
Requires: libstdc++-devel
%description devel
%description devel -l pl.UTF-8
Pliki nagłówkowe bibliotek DCMTK.
-%package static
-Summary: Static DCMTK libraries
-Summary(pl.UTF-8): Statyczne biblioteki DCMTK
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static DCMTK libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki DCMTK.
-
-%package apidocs
-Summary: DCMTK API documentation
-Summary(pl.UTF-8): Dokumentacja API bibliotek DCMTK
-Group: Documentation
-
-%description apidocs
-API documentation for DCMTK library.
-
-%description apidocs -l pl.UTF-8
-Dokumentacja API bibliotek DCMTK.
-
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+
+# enforce system CharLS
+%{__rm} -r dcmjpls/libcharls
%build
-%configure \
- --datadir=%{_datadir}/dcmtk \
- --sysconfdir=%{_sysconfdir}/dcmtk
+%cmake . \
+ -DDCMTK_WITH_OPENSSL=ON \
+ -DDCMTK_WITH_PNG=ON \
+ -DDCMTK_WITH_PRIVATE_TAGS=ON \
+ -DDCMTK_WITH_TIFF=ON \
+ -DDCMTK_WITH_XML=ON \
+ -DDCMTK_WITH_CHARLS=ON \
+ -DDCMTK_WITH_ZLIB=ON
%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install-all \
+%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/dcmtk
+
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%files
%defattr(644,root,root,755)
-%doc ANNOUNCE.360 CHANGES.360 COPYRIGHT FAQ HISTORY README
+%doc ANNOUNCE.360 CHANGES.360 COPYRIGHT FAQ HISTORY README dcmdata/docs/datadict.txt dcmnet/docs/asconfig.txt dcmqrdb/docs/dcmqr*.txt dcmtls/docs/ciphers.txt dcmwlm/docs/wwwapp.txt
%attr(755,root,root) %{_bindir}/dcm*
%attr(755,root,root) %{_bindir}/dcod2lum
%attr(755,root,root) %{_bindir}/dconvlum
%{_mandir}/man1/xml2dcm.1*
%{_mandir}/man1/xml2dsr.1*
+%files libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdcmdata.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmdata.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmdsig.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmdsig.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmimage.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmimage.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmimgle.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmimgle.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmjpeg.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpeg.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmjpls.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmjpls.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmnet.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmnet.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmpstat.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmpstat.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmqrdb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmqrdb.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmsr.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmsr.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmtls.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmtls.so.3.6
+%attr(755,root,root) %{_libdir}/libdcmwlm.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libdcmwlm.so.3.6
+%attr(755,root,root) %{_libdir}/libi2d.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libi2d.so.3.6
+%attr(755,root,root) %{_libdir}/libijg12.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libijg12.so.3.6
+%attr(755,root,root) %{_libdir}/libijg16.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libijg16.so.3.6
+%attr(755,root,root) %{_libdir}/libijg8.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libijg8.so.3.6
+%attr(755,root,root) %{_libdir}/liboflog.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liboflog.so.3.6
+%attr(755,root,root) %{_libdir}/libofstd.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libofstd.so.3.6
+
%files devel
%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libdcmdata.so
+%attr(755,root,root) %{_libdir}/libdcmdsig.so
+%attr(755,root,root) %{_libdir}/libdcmimage.so
+%attr(755,root,root) %{_libdir}/libdcmimgle.so
+%attr(755,root,root) %{_libdir}/libdcmjpeg.so
+%attr(755,root,root) %{_libdir}/libdcmjpls.so
+%attr(755,root,root) %{_libdir}/libdcmnet.so
+%attr(755,root,root) %{_libdir}/libdcmpstat.so
+%attr(755,root,root) %{_libdir}/libdcmqrdb.so
+%attr(755,root,root) %{_libdir}/libdcmsr.so
+%attr(755,root,root) %{_libdir}/libdcmtls.so
+%attr(755,root,root) %{_libdir}/libdcmwlm.so
+%attr(755,root,root) %{_libdir}/libi2d.so
+%attr(755,root,root) %{_libdir}/libijg12.so
+%attr(755,root,root) %{_libdir}/libijg16.so
+%attr(755,root,root) %{_libdir}/libijg8.so
+%attr(755,root,root) %{_libdir}/liboflog.so
+%attr(755,root,root) %{_libdir}/libofstd.so
%{_includedir}/dcmtk
-
-#%files static
-#%defattr(644,root,root,755)
-%{_libdir}/libcharls.a
-%{_libdir}/libdcmdata.a
-%{_libdir}/libdcmdsig.a
-%{_libdir}/libdcmimage.a
-%{_libdir}/libdcmimgle.a
-%{_libdir}/libdcmjpeg.a
-%{_libdir}/libdcmjpls.a
-%{_libdir}/libdcmnet.a
-%{_libdir}/libdcmpstat.a
-%{_libdir}/libdcmqrdb.a
-%{_libdir}/libdcmsr.a
-%{_libdir}/libdcmtls.a
-%{_libdir}/libdcmwlm.a
-%{_libdir}/libi2d.a
-%{_libdir}/libijg12.a
-%{_libdir}/libijg16.a
-%{_libdir}/libijg8.a
-%{_libdir}/liboflog.a
-%{_libdir}/libofstd.a
-
-#%if %{with apidocs}
-#%files apidocs
-#%defattr(644,root,root,755)
-#%doc apidocs/*
-#%endif
projects / packages / dcmtk.git / commitdiff