dcmtk-3.6.1-0004-Use-cmake-suggested-location-for-CharLS.patch

   1 From 356494231c72c30d4cfa17559891863c1c0c483b Mon Sep 17 00:00:00 2001
   2 From: Mario Ceresa <mario.ceresa@upf.edu>
   3 Date: Mon, 15 Dec 2014 14:26:11 +0100
   4 Subject: [PATCH] Use cmake suggested location for CharLS
   5
   6 ---
   7  dcmjpls/apps/CMakeLists.txt   | 2 +-
   8  dcmjpls/libsrc/CMakeLists.txt | 2 +-
   9  2 files changed, 2 insertions(+), 2 deletions(-)
  10
  11 diff --git a/dcmjpls/apps/CMakeLists.txt b/dcmjpls/apps/CMakeLists.txt
  12 index 2e881d7..6170f8a 100644
  13 --- a/dcmjpls/apps/CMakeLists.txt
  14 +++ b/dcmjpls/apps/CMakeLists.txt
  15 @@ -8,5 +8,5 @@ ENDFOREACH(PROGRAM)
  16
  17  # make sure executables are linked to the corresponding libraries
  18  FOREACH(PROGRAM dcmcjpls dcmdjpls dcml2pnm)
  19 -  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls charls dcmimage dcmimgle dcmdata oflog ofstd ofstd)
  20 +  DCMTK_TARGET_LINK_MODULES(${PROGRAM} dcmjpls ${CHARLS_LIBS} dcmimage dcmimgle dcmdata oflog ofstd ofstd)
  21  ENDFOREACH(PROGRAM)
  22 diff --git a/dcmjpls/libsrc/CMakeLists.txt b/dcmjpls/libsrc/CMakeLists.txt
  23 index 8a7b4e8..dc3ff44 100644
  24 --- a/dcmjpls/libsrc/CMakeLists.txt
  25 +++ b/dcmjpls/libsrc/CMakeLists.txt
  26 @@ -4,4 +4,4 @@ INCLUDE_DIRECTORIES(${dcmjpls_SOURCE_DIR}/include ${ofstd_SOURCE_DIR}/include ${
  27  # create library from source files
  28  DCMTK_ADD_LIBRARY(dcmjpls djcparam djdecode djencode djrparam djcodecd djutils djcodece)
  29
  30 -DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage charls)
  31 +DCMTK_TARGET_LINK_MODULES(dcmjpls ofstd oflog dcmdata dcmimgle dcmimage ${CHARLS_LIBS})
  32 --
  33 1.9.3
  34