Merge remote-tracking branch 'origin/Applications/18.04'

CMakeLists.txt

@@ -90,6 +90,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
 
 find_package(ZLIB REQUIRED)
 
+# This is here instead of in generators since we use if(Poppler_Qt5_FOUND) in autotests/
+find_package(Poppler "0.12.1" COMPONENTS Qt5)
+set_package_properties("Poppler" PROPERTIES
+        TYPE RECOMMENDED
+        PURPOSE "Support for PDF files in okular.")
+
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 add_definitions(-DTRANSLATION_DOMAIN="okular")
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)

autotests/CMakeLists.txt

@@ -7,10 +7,12 @@ ecm_add_test(shelltest.cpp ../shell/shellutils.cpp
     LINK_LIBRARIES Qt5::Test okularcore
 )
 
-ecm_add_test(parttest.cpp
-    TEST_NAME "parttest"
-    LINK_LIBRARIES Qt5::Widgets Qt5::Test Qt5::Xml okularcore okularpart
-)
+if(Poppler_Qt5_FOUND)
+    ecm_add_test(parttest.cpp
+        TEST_NAME "parttest"
+        LINK_LIBRARIES Qt5::Widgets Qt5::Test Qt5::Xml okularcore okularpart
+    )
+endif()
 
 ecm_add_test(documenttest.cpp
     TEST_NAME "documenttest"

generators/CMakeLists.txt

@@ -7,11 +7,6 @@ function(okular_add_generator _target)
   )
 endfunction()
 
-find_package(Poppler "0.12.1" COMPONENTS Qt5)
-set_package_properties("Poppler" PROPERTIES
-        TYPE RECOMMENDED
-        PURPOSE "Support for PDF files in okular.")
-
 set(LIBSPECTRE_MINIMUM_VERSION "0.2")
 find_package(LibSpectre "${LIBSPECTRE_MINIMUM_VERSION}")
 set_package_properties(LibSpectre PROPERTIES