Differential D12665 Diff 33810 generators/poppler/CMakeLists.txt

Changeset View

Standalone View

View Options

generators/poppler/CMakeLists.txt

Show First 20 Lines • Show All 77 Lines • ▼ Show 20 Line(s)
78#include <poppler-link.h> 78​#include <poppler-link.h>
79int main() 79​int main()
80{ 80​{
81 Poppler::FormField *f; 81​ Poppler::FormField *f;
82 f->setReadOnly(true); 82​ f->setReadOnly(true);
83 f->setVisible(true); 83​ f->setVisible(true);
84 Poppler::Link *l; 84​ Poppler::Link *l;
85 l->nextLinks(); 85​ l->nextLinks();
86​ f->additionalAction(Poppler::Annotation::CursorEnteringAction);
aacidUnsubmitted
Not Done

You need to move this to a whole new block since it has to be in a check for 0.65 not for 0.64

aacid: You need to move this to a whole new block since it has to be in a check for 0.65 not for 0.64
86} 87​}
87" HAVE_POPPLER_0_64) 88​" HAVE_POPPLER_0_64)
88 89​
89configure_file( 90​configure_file(
90 ${CMAKE_CURRENT_SOURCE_DIR}/config-okular-poppler.h.cmake 91​ ${CMAKE_CURRENT_SOURCE_DIR}/config-okular-poppler.h.cmake
91 ${CMAKE_CURRENT_BINARY_DIR}/config-okular-poppler.h 92​ ${CMAKE_CURRENT_BINARY_DIR}/config-okular-poppler.h
92) 93​)
93 94​
94include_directories( 95​include_directories(
95 ${CMAKE_CURRENT_SOURCE_DIR}/../.. 96​ ${CMAKE_CURRENT_SOURCE_DIR}/../..
96) 97​)
97 98​
aheineckeAuthorUnsubmitted
Not Done

Out of curiosity: Why is this and the other "check compiles" tests for released versions of poppler not:

if (Poppler_VERSION VERSION_GREATER "0.64.99")
  set (HAVE_POPPLER_0_65 1)
endif()
aheinecke: Out of curiosity: Why is this and the other "check compiles" tests for released versions of…
aacidUnsubmitted
Not Done

In this case you could do it (i assume the syntax is correct), but most of the times the feature is developed both here and in poppler so at that point there's no actual poppler version out yet, so you can't depend on a version number that doesn't exist.

aacid: In this case you could do it (i assume the syntax is correct), but most of the times the…
98########### next target ############### 99​########### next target ###############
99 100​
100set(okularGenerator_poppler_PART_SRCS 101​set(okularGenerator_poppler_PART_SRCS
101 generator_pdf.cpp 102​ generator_pdf.cpp
102 formfields.cpp 103​ formfields.cpp
103 annots.cpp 104​ annots.cpp
104) 105​)
105 106​
Show All 14 Lines