[gdcm] Update charls patch for linking

Orion Poplawski orion at fedoraproject.org
Wed Nov 2 15:53:30 UTC 2011


commit b703dcbf76a4cb81b282b8e79434fb3f4b7da948
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Wed Nov 2 09:53:28 2011 -0600

    Update charls patch for linking

 gdcm-2.0.14-use_system_charls.patch |  101 -----------------------------------
 gdcm-2.0.18-charls.patch            |   12 ++++
 2 files changed, 12 insertions(+), 101 deletions(-)
---
diff --git a/gdcm-2.0.18-charls.patch b/gdcm-2.0.18-charls.patch
index d67f1a5..f7d6f51 100644
--- a/gdcm-2.0.18-charls.patch
+++ b/gdcm-2.0.18-charls.patch
@@ -1,3 +1,15 @@
+diff -up gdcm-2.0.18/Examples/Cxx/CMakeLists.txt.charls gdcm-2.0.18/Examples/Cxx/CMakeLists.txt
+--- gdcm-2.0.18/Examples/Cxx/CMakeLists.txt.charls	2011-06-29 01:08:45.000000000 -0600
++++ gdcm-2.0.18/Examples/Cxx/CMakeLists.txt	2011-11-02 09:33:12.023845136 -0600
+@@ -107,7 +107,7 @@ ENDIF(GDCM_BUILD_TESTING)
+ FOREACH(example ${EXAMPLES_SRCS})
+   ADD_EXECUTABLE(${example} ${example}.cxx)
+   IF(${example} STREQUAL "FixJAIBugJPEGLS")
+-    TARGET_LINK_LIBRARIES(${example} gdcmMSFF gdcmcharls)
++    TARGET_LINK_LIBRARIES(${example} gdcmMSFF ${GDCM_CHARLS_LIBRARIES})
+   ELSE()
+     TARGET_LINK_LIBRARIES(${example} gdcmMSFF)
+   ENDIF()
 diff -up gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx.charls gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx
 --- gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx.charls	2011-06-29 01:08:45.000000000 -0600
 +++ gdcm-2.0.18/Examples/Cxx/FixJAIBugJPEGLS.cxx	2011-11-02 09:15:59.630494712 -0600


More information about the scm-commits mailing list