View | Details | Raw Unified | Return to bug 190476
Collapse All | Expand All

(-)files/patch-CMakeLists.txt (-6 / +15 lines)
Lines 1-11 Link Here
1 
--- CMakeLists.txt.orig	2012-01-02 12:11:48.000000000 +0100
 1 
--- CMakeLists.txt.orig	2014-04-03 02:33:49.000000000 -0500
2 
+++ CMakeLists.txt	2012-01-02 12:13:50.000000000 +0100
 2 
+++ CMakeLists.txt	2014-05-31 12:46:17.849190033 -0500
3 
@@ -45,7 +45,7 @@
 3 
@@ -48,7 +48,7 @@
4 
   "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}")
 4 
 endif()
5 
 SET(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES}
 5 
 set(GDCM_LIBRARY_PROPERTIES ${GDCM_LIBRARY_PROPERTIES}
6 
   VERSION "${GDCM_VERSION}"
 6 
   VERSION "${GDCM_VERSION}"
7 
-  SOVERSION "${GDCM_API_VERSION}"
 7 
-  SOVERSION "${GDCM_API_VERSION}"
8 
+  SOVERSION "${GDCM_MAJOR_VERSION}"
 8 
+  SOVERSION "${GDCM_MAJOR_VERSION}"
9 
 )
 9 
 )
10 
 #SET(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES}
 10 
 #set(GDCM_EXECUTABLE_PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES}
11 
 #  VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
 11 
 #  VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
12 
@@ -373,7 +373,7 @@
13 
   # find_package(OpenJPEG 2.0 REQUIRED)
14 
   # oh well we should handle both 1.0 and 2.0 anyway...
15 
   find_package(OpenJPEG REQUIRED)
16 
-  set(GDCM_OPENJPEG_LIBRARIES ${OPENJPEG_LIBRARIES})
17 
+  set(GDCM_OPENJPEG_LIBRARIES /usr/local/lib/libopenjpeg.so)
18 
 else()
19 
   set(GDCM_OPENJPEG_LIBRARIES gdcmopenjpeg)
20 
   option(GDCM_USE_OPENJPEG_V2 "Use openjpeg v2 version (advanced users only)." OFF)
(-)files/patch-Source-Common_gdcmConfigure.h.in (+11 lines)
Line 0 Link Here
1 
--- Source/Common/gdcmConfigure.h.in.orig	2014-04-03 02:33:49.000000000 -0500
2 
+++ Source/Common/gdcmConfigure.h.in	2014-05-31 12:24:20.540187129 -0500
3 
@@ -70,7 +70,7 @@
4 
 #define OPENJPEG_MAJOR_VERSION 1
5 
 #endif // GDCM_USE_OPENJPEG_V2
6 
 #else
7 
-#define OPENJPEG_MAJOR_VERSION @OPENJPEG_MAJOR_VERSION@
8 
+#define OPENJPEG_MAJOR_VERSION 1
9 
 #endif //GDCM_USE_SYSTEM_OPENJPEG
10
11 
 #ifndef OPENJPEG_MAJOR_VERSION

Return to bug 190476