Hello community, here is the log from the commit of package dcmtk for openSUSE:Factory checked in at 2011-12-19 16:09:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dcmtk (Old) and /work/SRC/openSUSE:Factory/.dcmtk.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dcmtk", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/dcmtk/dcmtk.changes 2011-09-26 17:02:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dcmtk.new/dcmtk.changes 2011-12-19 16:09:12.000000000 +0100 @@ -1,0 +2,33 @@ +Tue Dec 13 09:06:48 UTC 2011 - co...@suse.com + +- fix last change + +------------------------------------------------------------------- +Mon Dec 12 20:24:52 UTC 2011 - asterios.dra...@gmail.com + +- Spec file updates: + * Changed libdcmtk3 subpackage name to libdcmtk3_6 which is the correct one + according to openSUSE shared library packaging policy. + +------------------------------------------------------------------- +Sun Dec 11 17:38:17 UTC 2011 - asterios.dra...@gmail.com + +- Added seven patches (taken from Fedora) to make the package build shared + libraries (using cmake) and link to the system "CharLS" library instead of + the internal copy: + + dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch + + dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch + + dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch + + dcmtk-3.6.0-0004-Use-system-charls.patch + + dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch + + dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch + + dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch +- Added a patch "dcmtk-3.6.0.diff" to fix libraries linking. +- Spec file updates: + * Changed License: entry to SPDX style. Removed "AS IS" to fix rpmlint + warning "invalid-license". + * Adapted spec file to the cmake usage and building of shared libraries. + Added a libdcmtk3 subpackage. + * Added CharLS-devel in BuildRequires:. + +------------------------------------------------------------------- Old: ---- dcmtk-3.6.0.tar.bz2 New: ---- dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch dcmtk-3.6.0-0004-Use-system-charls.patch dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch dcmtk-3.6.0.diff dcmtk-3.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dcmtk.spec ++++++ --- /var/tmp/diff_new_pack.FoT9PO/_old 2011-12-19 16:09:14.000000000 +0100 +++ /var/tmp/diff_new_pack.FoT9PO/_new 2011-12-19 16:09:14.000000000 +0100 @@ -16,15 +16,32 @@ # - Name: dcmtk Version: 3.6.0 -Release: 3 -License: AS IS, BSD, ASL-2.0 +Release: 0 +%define libname libdcmtk3_6 Summary: DICOM Toolkit -Url: http://dicom.offis.de/dcmtk.php.en +License: BSD-3-Clause and Apache-2.0 Group: Productivity/Scientific/Other -Source: dcmtk-3.6.0.tar.bz2 +Url: http://dicom.offis.de/dcmtk.php.en +Source0: ftp://dicom.offis.de/pub/dicom/offis/software/dcmtk/dcmtk360/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch asterios.dra...@gmail.com -- Add soname information for all targets +Patch0: dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch +# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch asterios.dra...@gmail.com -- Install libs in the correct arch dir +Patch1: dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch +# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch asterios.dra...@gmail.com -- Removed bundled libcharl reference in dcmjpls +Patch2: dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch +# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0004-Use-system-charls.patch asterios.dra...@gmail.com -- Use system charls +Patch3: dcmtk-3.6.0-0004-Use-system-charls.patch +# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch asterios.dra...@gmail.com -- Fix includes for CharLS 1.0 +Patch4: dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch +# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch asterios.dra...@gmail.com -- Add optional support for building shared libraries with CMake +Patch5: dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch +# PATCH-FIX-OPENSUSE dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch asterios.dra...@gmail.com -- Add soname generation for modules which are not in DCMTK_MODULES variable +Patch6: dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch +# PATCH-FIX-OPENSUSE dcmtk-3.6.0.diff asterios.dra...@gmail.com -- Fix libraries linking +Patch7: dcmtk-3.6.0.diff +BuildRequires: CharLS-devel BuildRequires: cmake BuildRequires: doxygen BuildRequires: fdupes @@ -43,56 +60,97 @@ parts the DICOM standard. %package devel -Summary: Development files for %{name} -License: AS IS, BSD, ASL-2.0 +Summary: Development files for dcmtk Group: Development/Libraries/C and C++ -Requires: %{name} = %{version} +Requires: %{libname} = %{version} %description devel This package provides development libraries and headers needed to build -software using %{name} +software using dcmtk. + +%package -n %{libname} +Summary: DICOM Toolkit +Group: System/Libraries + +%description -n libdcmtk3_6 +DCMTK is a collection of libraries and applications implementing large +parts the DICOM standard. %prep -%setup -q -n %{name}-%{version} +%setup -q +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 + +# Make sure the internal library copy is not used +rm -rf dcmjpls/libcharls/ %build -%configure -make +mkdir build +cd build +export CFLAGS="%{optflags}" +export CXXFLAGS="%{optflags}" + cmake \ + -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DINSTALL_DOCDIR=%{_docdir}/dcmtk \ + -DINSTALL_HTMDIR=%{_docdir}/dcmtk/html \ + -DBUILD_SHARED_LIBS=ON \ + %if "%{_lib}" == "lib64" + -DLIB_SUFFIX=64 \ + %endif + -DDCMTK_WITH_XML=ON \ + -DDCMTK_WITH_OPENSSL=ON \ + -DDCMTK_WITH_SNDFILE=ON \ + -DDCMTK_WITH_ZLIB=ON \ + -DDCMTK_WITH_CHARLS=ON \ + -DCMAKE_BUILD_TYPE=release .. +make %{?_smp_mflags} VERBOSE=1 +cd .. %install -make install-all DESTDIR=%{?buildroot} -mkdir -p %{buildroot}%{_docdir}/%{name} -mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/%{name} -%if 0%{?suse_version} < 1210 - rm -r %{buildroot}%{_docdir}/dcmtk/dcmtk/ -%else -%fdupes -s %{buildroot}%{_docdir}/%{name}/ -%endif +cd build +%make_install +cd .. + +# Fix binary name +mv -f %{buildroot}%{_bindir}/dcmsign-3.6.0 %{buildroot}%{_bindir}/dcmsign + +# Move configuration files from /usr/etc to /etc/ +mv %{buildroot}%{_prefix}/etc %{buildroot} + +# Move doc files from /usr/share/doc/dcmtk to /usr/share/doc/packages/dcmtk/ +mkdir %{buildroot}%{_docdir} +mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir} -%clean -rm -rf %{buildroot} +# Install README file to documentation +install -pm 0644 README %{buildroot}%{_docdir}/dcmtk/ + +%fdupes -s %{buildroot} + +%post -n %{libname} -p /sbin/ldconfig + +%postun -n %{libname} -p /sbin/ldconfig %files -%defattr(-,root,root) -%doc COPYRIGHT FAQ HISTORY README VERSION -%{_mandir}/man?/* -%{_docdir}/dcmtk -%config %{_sysconfdir}/*.cfg +%defattr(-,root,root,-) +%dir %{_sysconfdir}/dcmtk +%config(noreplace) %{_sysconfdir}/dcmtk/*.cfg %{_bindir}/* -%{_datadir}/*.dump -%{_datadir}/*.lut -%{_datadir}/*.dtd -%{_datadir}/*.dic -%{_datadir}/*.xsd -%{_datadir}/*.txt -%{_datadir}/*.css -%{_datadir}/wlistqry -%{_datadir}/wlistdb +%{_datadir}/dcmtk/ +%{_docdir}/dcmtk/ %files devel -%defattr(-,root,root) -%doc COPYRIGHT FAQ HISTORY README VERSION +%defattr(-,root,root,-) %{_includedir}/dcmtk/ -%{_libdir}/*.a +%{_libdir}/*.so + +%files -n %{libname} +%defattr(-,root,root,-) +%{_libdir}/*.so.3.6* %changelog ++++++ dcmtk-3.6.0-0001-Added-soname-information-for-all-targets.patch ++++++ >From 0465f8ceab739a0f096c97c31d43a934a6617099 Mon Sep 17 00:00:00 2001 From: Mario Ceresa <mrcer...@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-b...@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 ++++++ dcmtk-3.6.0-0002-Install-libs-in-the-correct-arch-dir.patch ++++++ >From 8401d7914ef110d5aca35bf7e1409341c533f1e4 Mon Sep 17 00:00:00 2001 From: Mario Ceresa <mrcer...@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 ++++++ dcmtk-3.6.0-0003-Removed-bundled-libcharl-reference-in-dcmjpls.patch ++++++ >From 066d61eaecdf0731be99782649340ed141b1d1be Mon Sep 17 00:00:00 2001 From: Mario Ceresa <mrcer...@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 ++++++ dcmtk-3.6.0-0004-Use-system-charls.patch ++++++ >From c20efddd5eee01bb5db0aeaac8fc0b64abf6d6cf Mon Sep 17 00:00:00 2001 From: Mario Ceresa <mrcer...@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 ++++++ dcmtk-3.6.0-0005-Fixed-includes-for-CharLS-1.0.patch ++++++ >From 6d6a52c1c049c0fe8440d8b03d5cb852a47c0cd5 Mon Sep 17 00:00:00 2001 From: Mario Ceresa <mrcer...@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 ++++++ dcmtk-3.6.0-0006-Added-optional-support-for-building-shared-libraries.patch ++++++ >From d3284cf35b8d92029cba487a285cdd6aeee16d38 Mon Sep 17 00:00:00 2001 From: Joerg Riesmeier <di...@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 ++++++ dcmtk-3.6.0-0007-Add-soname-generation-for-modules-which-are-not-in-D.patch ++++++ >From 13f216a9ab2c93041cf18283ca4726c3c2e876d9 Mon Sep 17 00:00:00 2001 From: Mario Ceresa <mrcer...@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 ++++++ dcmtk-3.6.0.diff ++++++ --- dcmdata/libsrc/CMakeLists.txt +++ dcmdata/libsrc/CMakeLists.txt 2011-11-30 13:06:33.619146284 +0000 @@ -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 ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdata) --- dcmimage/libsrc/CMakeLists.txt +++ dcmimage/libsrc/CMakeLists.txt 2011-11-30 13:21:05.875647034 +0000 @@ -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 ${LIBTIFF_LIBS} ${LIBPNG_LIBS} ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimage) --- dcmimgle/libsrc/CMakeLists.txt +++ dcmimgle/libsrc/CMakeLists.txt 2011-11-30 13:21:05.875647034 +0000 @@ -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 ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmimgle) --- dcmjpeg/libsrc/CMakeLists.txt +++ dcmjpeg/libsrc/CMakeLists.txt 2011-11-30 13:21:05.875647034 +0000 @@ -4,5 +4,7 @@ INCLUDE_DIRECTORIES(${dcmjpeg_SOURCE_DIR # 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 ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmjpeg) --- dcmjpls/libsrc/CMakeLists.txt +++ dcmjpls/libsrc/CMakeLists.txt 2011-11-30 13:21:05.875647034 +0000 @@ -4,5 +4,7 @@ INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR # create library from source files ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece) +TARGET_LINK_LIBRARIES(dcmjpls ${CHARLS_LIBS} ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmjpls) --- dcmnet/libsrc/CMakeLists.txt +++ dcmnet/libsrc/CMakeLists.txt 2011-11-30 13:21:05.875647034 +0000 @@ -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 ${OPENSSL_LIBS} ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmnet) --- dcmqrdb/libsrc/CMakeLists.txt +++ dcmqrdb/libsrc/CMakeLists.txt 2011-11-30 13:21:05.875647034 +0000 @@ -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 ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmqrdb) --- dcmsign/libsrc/CMakeLists.txt +++ dcmsign/libsrc/CMakeLists.txt 2011-11-30 13:02:53.967145676 +0000 @@ -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 ${OPENSSL_LIBS} ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmdsig) --- dcmsr/libsrc/CMakeLists.txt +++ dcmsr/libsrc/CMakeLists.txt 2011-11-30 13:21:05.875647034 +0000 @@ -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 ${LIBXML_LIBS} ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmsr) --- dcmtls/libsrc/CMakeLists.txt +++ dcmtls/libsrc/CMakeLists.txt 2011-11-30 13:05:36.963646979 +0000 @@ -1,5 +1,7 @@ # create library from source files ADD_LIBRARY(dcmtls tlslayer tlstrans tlsscu) +TARGET_LINK_LIBRARIES(dcmtls ${OPENSSL_LIBS} ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmtls) --- dcmwlm/libsrc/CMakeLists.txt +++ dcmwlm/libsrc/CMakeLists.txt 2011-11-30 13:06:51.035145969 +0000 @@ -1,5 +1,7 @@ # create library from source files ADD_LIBRARY(dcmwlm wlds wldsfs wlfsim wlmactmg) +TARGET_LINK_LIBRARIES(dcmwlm ${ZLIB_LIBS} ${THREAD_LIBS}) + # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} dcmwlm) --- ofstd/libsrc/CMakeLists.txt.orig 2009-12-21 17:06:18.000000000 +0200 +++ ofstd/libsrc/CMakeLists.txt 2011-12-02 21:11:28.598297791 +0200 @@ -3,3 +3,5 @@ # declare installation files INSTALL_TARGETS(${INSTALL_LIBDIR} ofstd) + +TARGET_LINK_LIBRARIES(ofstd ${THREAD_LIBS}) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
