blob: 8e5ef1f26e7195692b9185625cdcba26414a0cdd (
plain) (
blame)
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
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
|
diff -Naur xpdf-4.03-orig/CMakeLists.txt xpdf-4.03/CMakeLists.txt
--- xpdf-4.03-orig/CMakeLists.txt 2021-01-27 23:23:51.000000000 +0100
+++ xpdf-4.03/CMakeLists.txt 2021-04-16 21:29:07.764217289 +0200
@@ -18,7 +18,6 @@
add_subdirectory(fofi)
add_subdirectory(splash)
add_subdirectory(xpdf)
-add_subdirectory(xpdf-qt)
if (NOT HAVE_FREETYPE_H)
message(WARNING "Couldn't find FreeType -- will not build pdftoppm, pdftopng, pdftohtml, or xpdf.")
@@ -28,10 +27,6 @@
message(WARNING "Couldn't find libpng -- will not build pdftopng or pdftohtml.")
endif ()
-if (NOT QT4_FOUND AND NOT Qt5Widgets_FOUND)
- message(WARNING "Couldn't find Qt4 or Qt5 -- will not build xpdf.")
-endif ()
-
if (NOT MULTITHREADED)
message(WARNING "Multithreading is disabled -- will not build xpdf.")
endif ()
diff -Naur xpdf-4.03-orig/cmake-config.txt xpdf-4.03/cmake-config.txt
--- xpdf-4.03-orig/cmake-config.txt 2021-01-27 23:23:51.000000000 +0100
+++ xpdf-4.03/cmake-config.txt 2021-04-16 21:29:55.164217289 +0200
@@ -207,64 +207,6 @@
#--- look for libpng
find_package(PNG)
-
-
-
-#--- look for Qt
-find_package(Qt5Widgets QUIET)
-if (Qt5Widgets_FOUND)
- find_package(Qt5Network)
- find_package(Qt5PrintSupport)
-else ()
- find_package(Qt4 COMPONENTS QtCore QtGui QtNetwork)
-endif ()
-if(Qt5Widgets_FOUND)
- message(STATUS "Qt5 found")
- if (XPDFWIDGET_PRINTING)
- set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5PrintSupport_INCLUDE_DIRS}")
- set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5PrintSupport_DEFINITIONS}")
- set(QT_LIBRARIES Qt5::Widgets Qt5::Network Qt5::PrintSupport)
- else ()
- set(QT_INCLUDES "${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS}")
- set(QT_DEFINITIONS "${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS}")
- set(QT_LIBRARIES Qt5::Widgets Qt5::Network)
- endif ()
- if (XPDFWIDGET_PRINTING)
- if (APPLE)
- set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
- elseif (UNIX)
- find_package(Cups)
- if (CUPS_FOUND)
- set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
- else ()
- set (XPDFWIDGET_PRINTING OFF)
- endif ()
- else ()
- set(EXTRA_QT_LIBRARIES "")
- endif ()
- endif ()
- # remove "-fPIE" here because we added "-fPIC" above
- string(REPLACE "-fPIE" "" QT_CFLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-elseif(QT4_FOUND)
- message(STATUS "Qt4 found")
- if (XPDFWIDGET_PRINTING)
- if (APPLE)
- set(EXTRA_QT_LIBRARIES "-framework ApplicationServices")
- elseif (UNIX)
- find_package(Cups)
- if (CUPS_FOUND)
- set(EXTRA_QT_LIBRARIES ${CUPS_LIBRARIES})
- else ()
- set (XPDFWIDGET_PRINTING OFF)
- endif ()
- else ()
- set(EXTRA_QT_LIBRARIES "")
- endif ()
- endif ()
-else()
- message(STATUS "No Qt library found")
-endif()
-
#--- look for libpaper
find_library(PAPER_LIBRARY
NAMES paper libpaper
|
