mirror of
https://invent.kde.org/graphics/okular
synced 2024-10-01 05:33:33 +00:00
Move find ecm to the top
This fixes the build failures on Android
This commit is contained in:
parent
ce3af32709
commit
dd09ce7591
|
@ -15,6 +15,23 @@ set(OKULAR_UI "" CACHE STRING "Which Okular user interface to build. Possible va
|
|||
|
||||
option(FORCE_NOT_REQUIRED_DEPENDENCIES "List (semicolon-separated) of dependencies that will be downgraded from REQUIRED to RECOMMENDED")
|
||||
|
||||
find_package(ECM ${KF_REQUIRED_VERSION} CONFIG REQUIRED)
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
|
||||
|
||||
include(ECMInstallIcons)
|
||||
include(ECMSetupVersion)
|
||||
include(ECMOptionalAddSubdirectory)
|
||||
include(GenerateExportHeader)
|
||||
include(FeatureSummary)
|
||||
include(ECMAddAppIcon)
|
||||
include(KDECompilerSettings NO_POLICY_SCOPE)
|
||||
include(KDEInstallDirs)
|
||||
include(KDECMakeSettings)
|
||||
include(ECMAddTests)
|
||||
include(ECMAddAppIcon)
|
||||
include(CMakePackageConfigHelpers)
|
||||
include(ECMSetupQtPluginMacroNames)
|
||||
|
||||
if (ANDROID AND (NOT FORCE_NOT_REQUIRED_DEPENDENCIES) AND (NOT FORCE_NOT_REQUIRED_DEPENDENCIES STREQUAL ""))
|
||||
set(FORCE_NOT_REQUIRED_DEPENDENCIES "KF6Wallet;KF6DocTools;Qt6Qml;TIFF;JPEG;LibSpectre;KExiv2Qt6;CHM;LibZip;DjVuLibre;EPub;Discount;")
|
||||
endif()
|
||||
|
@ -69,23 +86,6 @@ if (BUILD_MOBILE)
|
|||
set(QT_REQUIRED_VERSION "5.15.2")
|
||||
endif()
|
||||
|
||||
find_package(ECM ${KF_REQUIRED_VERSION} CONFIG REQUIRED)
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
|
||||
|
||||
include(ECMInstallIcons)
|
||||
include(ECMSetupVersion)
|
||||
include(ECMOptionalAddSubdirectory)
|
||||
include(GenerateExportHeader)
|
||||
include(FeatureSummary)
|
||||
include(ECMAddAppIcon)
|
||||
include(KDECompilerSettings NO_POLICY_SCOPE)
|
||||
include(KDEInstallDirs)
|
||||
include(KDECMakeSettings)
|
||||
include(ECMAddTests)
|
||||
include(ECMAddAppIcon)
|
||||
include(CMakePackageConfigHelpers)
|
||||
include(ECMSetupQtPluginMacroNames)
|
||||
|
||||
# append the plugins from the install tree folder to the QT_PLUGIN_PATH
|
||||
if(UNIX)
|
||||
set(ENV{QT_PLUGIN_PATH} "$ENV{QT_PLUGIN_PATH}:${KDE_INSTALL_FULL_QTPLUGINDIR}")
|
||||
|
|
Loading…
Reference in a new issue