Package: engauge-digitizer / 12.1+ds.1-1

030_fix_check_for_openjpg_lib.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
Description: Fix handling of libopenjp2 in build system 
Last-Update: 2016-07-09

--- a/engauge.pro
+++ b/engauge.pro
@@ -855,15 +855,11 @@
     _OPENJPEG_LIB = $$(OPENJPEG_LIB)
     isEmpty(_OPENJPEG_INCLUDE) {
       error("OPENJPEG_INCLUDE and OPENJPEG_LIB environment variables must be defined")
-    } else {
-      isEmpty(_OPENJPEG_LIB) {
-        error("OPENJPEG_INCLUDE and OPENJPEG_LIB environment variables must be defined")
-      }
-    }
-    DEFINES += "ENGAUGE_JPEG2000"
+    } 
+		DEFINES += "ENGAUGE_JPEG2000"
     INCLUDEPATH += $$(OPENJPEG_INCLUDE) \
                    src/Jpeg2000
-    LIBS += -L$$(OPENJPEG_LIB) -lopenjp2
+    LIBS += -lopenjp2
     HEADERS += src/Jpeg2000/Jpeg2000.h \
                src/Jpeg2000/Jpeg2000Callbacks.h \
                src/Jpeg2000/Jpeg2000Color.h \
@@ -874,7 +870,6 @@
                src/Jpeg2000/Jpeg2000Color.cpp \
                src/Jpeg2000/Jpeg2000Convert.cpp
     QMAKE_LFLAGS += -Wl,-rpath=\'\$\$ORIGIN\'
-    QMAKE_POST_LINK += cp $$(OPENJPEG_LIB)/libopenjp2.so.7 bin
 
 } else {
     message("JPEG2000 support:   no")