Differential D12665 Diff 35015 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} 86​}
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
87" HAVE_POPPLER_0_64) 87​" HAVE_POPPLER_0_64)
88 88​
89​check_cxx_source_compiles("
90​#include <poppler-qt5.h>
91​#include <poppler-form.h>
92​int main()
93​{
94​ Poppler::FormField *f;
95​ f->additionalAction(Poppler::Annotation::CursorEnteringAction);
96​}
97​" HAVE_POPPLER_0_65)
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​
89configure_file( 99​configure_file(
90 ${CMAKE_CURRENT_SOURCE_DIR}/config-okular-poppler.h.cmake 100​ ${CMAKE_CURRENT_SOURCE_DIR}/config-okular-poppler.h.cmake
91 ${CMAKE_CURRENT_BINARY_DIR}/config-okular-poppler.h 101​ ${CMAKE_CURRENT_BINARY_DIR}/config-okular-poppler.h
92) 102​)
93 103​
94include_directories( 104​include_directories(
95 ${CMAKE_CURRENT_SOURCE_DIR}/../.. 105​ ${CMAKE_CURRENT_SOURCE_DIR}/../..
96) 106​)
Show All 23 Lines