diff --git a/clients/mobile/main.cpp b/clients/mobile/main.cpp index 47f4b9bb..75d83edd 100644 --- a/clients/mobile/main.cpp +++ b/clients/mobile/main.cpp @@ -1,176 +1,199 @@ /*************************************************************************** * Copyright (C) 2009-2015 by Savoir-Faire Linux * * Author : Jérémy Quentin * * Emmanuel Lepage Vallee * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * * the Free Software Foundation; either version 3 of the License, or * * (at your option) any later version. * * * * This program is distributed in the hope that it will be useful, * * but WITHOUT ANY WARRANTY; without even the implied warranty of * * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * * GNU General Public License for more details. * * * * You should have received a copy of the GNU General Public License * * along with this program. If not, see . * **************************************************************************/ //Qt #include #include #include #include #include //KDE #include #include #include #include //Ring #include "kcfg_settings.h" #include #include #ifdef KQUICKITEMVIEWS_USE_STATIC_PLUGIN Q_IMPORT_PLUGIN(KQuickItemViews) #else #include #endif Q_IMPORT_PLUGIN(JamiKDEIntegration) Q_IMPORT_PLUGIN(JamiWizard) Q_IMPORT_PLUGIN(JamiAccountView) Q_IMPORT_PLUGIN(JamiCallView) Q_IMPORT_PLUGIN(JamiContactView) Q_IMPORT_PLUGIN(JamiDialView) Q_IMPORT_PLUGIN(JamiTimelineView) Q_IMPORT_PLUGIN(JamiCanvasIndicator) Q_IMPORT_PLUGIN(JamiPhotoSelector) Q_IMPORT_PLUGIN(JamiVideoView) Q_IMPORT_PLUGIN(JamiTroubleshooting) Q_IMPORT_PLUGIN(JamiChatView) Q_IMPORT_PLUGIN(JamiHistoryView) Q_IMPORT_PLUGIN(JamiTimelineBase) Q_IMPORT_PLUGIN(JamiSearch) Q_IMPORT_PLUGIN(JamiAudioPlayer) Q_IMPORT_PLUGIN(GenericUtils) Q_IMPORT_PLUGIN(RingQtQuick) +// Qt plusing +#ifdef false + Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) + Q_IMPORT_PLUGIN(QtQuick2Plugin) + Q_IMPORT_PLUGIN(QtQuickControls1Plugin) + Q_IMPORT_PLUGIN(QtQuickControls2Plugin) + Q_IMPORT_PLUGIN(QtQuick2WindowPlugin) + Q_IMPORT_PLUGIN(QEvdevKeyboardPlugin) + Q_IMPORT_PLUGIN(QEvdevMousePlugin) + Q_IMPORT_PLUGIN(QtQuickLayoutsPlugin) + Q_IMPORT_PLUGIN(QtQuickTemplates2Plugin) + Q_IMPORT_PLUGIN(QJpegPlugin) + //Q_IMPORT_PLUGIN(QJpegPlugin) + Q_IMPORT_PLUGIN(QSvgPlugin) + Q_IMPORT_PLUGIN(QSvgIconPlugin) + Q_IMPORT_PLUGIN(QXcbGlxIntegrationPlugin) + Q_IMPORT_PLUGIN(QtGraphicalEffectsPlugin) + Q_IMPORT_PLUGIN(QtGraphicalEffectsPrivatePlugin) + Q_IMPORT_PLUGIN(QtQmlModelsPlugin) + Q_IMPORT_PLUGIN(KirigamiPlugin) + Q_IMPORT_PLUGIN(QQc2DesktopStylePlugin) +#endif + #ifdef HAS_ICON_PACK Q_IMPORT_PLUGIN(BreezeIconPack) #endif #if false Q_IMPORT_PLUGIN(DesktopView) #else Q_IMPORT_PLUGIN(BasicView) #endif #ifndef Q_OS_ANDROID Q_IMPORT_PLUGIN(JamiNotification) #endif constexpr static const char version[] = "3.1.0"; #define REGISTER_PLUGIN(name, uri) \ qobject_cast(qt_static_plugin_ ## name().instance())->registerTypes(uri); \ qobject_cast(qt_static_plugin_ ## name().instance())->initializeEngine(&engine, uri); int main(int argc, char **argv) { //QQmlDebuggingEnabler enabler; QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QApplication app(argc, argv); QQmlApplicationEngine engine; KLocalizedString::setApplicationDomain("ring-kde"); //FIXME remove #ifdef KQUICKITEMVIEWS_USE_STATIC_PLUGIN qobject_cast(qt_static_plugin_KQuickItemViews().instance())->registerTypes("org.kde.playground.kquickitemviews"); #else KQuickItemViews v; v.registerTypes("org.kde.playground.kquickitemviews"); #endif // The order is important REGISTER_PLUGIN(JamiKDEIntegration, "org.kde.ringkde.jamikdeintegration") REGISTER_PLUGIN(RingQtQuick, "net.lvindustries.ringqtquick") // The order is not important REGISTER_PLUGIN(GenericUtils, "org.kde.ringkde.genericutils") REGISTER_PLUGIN(JamiWizard, "org.kde.ringkde.jamiwizard") REGISTER_PLUGIN(JamiAccountView, "org.kde.ringkde.jamiaccountview") REGISTER_PLUGIN(JamiCallView, "org.kde.ringkde.jamicallview") REGISTER_PLUGIN(JamiContactView, "org.kde.ringkde.jamicontactview") REGISTER_PLUGIN(JamiDialView, "org.kde.ringkde.jamidialview") REGISTER_PLUGIN(JamiTimelineView, "org.kde.ringkde.jamitimeline") REGISTER_PLUGIN(JamiCanvasIndicator, "org.kde.ringkde.jamicanvasindicator") REGISTER_PLUGIN(JamiPhotoSelector, "org.kde.ringkde.jamiphotoselector") REGISTER_PLUGIN(JamiVideoView, "org.kde.ringkde.jamivideoview") REGISTER_PLUGIN(JamiTroubleshooting, "org.kde.ringkde.jamitroubleshooting") REGISTER_PLUGIN(JamiTimelineBase, "org.kde.ringkde.jamitimelinebase") REGISTER_PLUGIN(JamiSearch, "org.kde.ringkde.jamisearch") REGISTER_PLUGIN(JamiHistoryView, "org.kde.ringkde.jamihistoryview") REGISTER_PLUGIN(JamiChatView, "org.kde.ringkde.jamichatview") REGISTER_PLUGIN(JamiAudioPlayer, "org.kde.ringkde.jamiaudioplayer") #ifndef Q_OS_ANDROID REGISTER_PLUGIN(JamiNotification, "org.kde.ringkde.jaminotification") #endif #if false REGISTER_PLUGIN(DesktopView, "org.kde.ringkde.desktopview") #else REGISTER_PLUGIN(BasicView, "org.kde.ringkde.basicview") #endif KDeclarative::KDeclarative d; d.setDeclarativeEngine(&engine); KAboutData about(QStringLiteral("ring-kde"), i18n("ring-kde"), /*QStringLiteral(*/version/*)*/, i18n("RING, a secured and distributed communication software"), KAboutLicense::GPL_V3, i18n("(C) 2004-2015 Savoir-faire Linux\n2016-2017 Emmanuel Lepage Vallee\n2017-2019 Blue Systems"), QString(), QStringLiteral("http://www.ring.cx"), QStringLiteral("ring@gnu.org") ); about.setOrganizationDomain(QByteArray("kde.org")); about.setProgramLogo(QImage(QStringLiteral(":appicon/icons/64-apps-ring-kde.png"))); about.addAuthor( i18n( "Emmanuel Lepage-Vallée" ), QString(), QStringLiteral("elv1313@gmail.com" )); about.addAuthor( i18n( "Alexandre Lision" ), QString(), QStringLiteral("alexandre.lision@savoirfairelinux.com")); about.addCredit( i18n( "Based on the SFLphone teamworks" ), QString(), QString() ); KAboutData::setApplicationData(about); KCrash::initialize(); app.setOrganizationDomain(QStringLiteral("kde.org")); #if false engine.load(QUrl(QStringLiteral("qrc:/desktopview/qml/desktopwindow.qml"))); #else engine.load(QUrl(QStringLiteral("qrc:/basicview/qml/basic.qml"))); #endif const int retVal = app.exec(); ConfigurationSkeleton::self()->save(); return retVal; } // kate: space-indent on; indent-width 4; replace-tabs on; diff --git a/src/accountview/CMakeLists.txt b/src/accountview/CMakeLists.txt index ef90d01a..bfef9f0e 100644 --- a/src/accountview/CMakeLists.txt +++ b/src/accountview/CMakeLists.txt @@ -1,119 +1,130 @@ cmake_minimum_required(VERSION 3.0) project(jamiaccountview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIACCOUNTVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamiaccountview_LIB_SRCS accountviewplugin.cpp ) qt5_add_resources(jamiaccountview_LIB_SRCS accountview.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamiaccountview) add_library(jamiaccountview ${jamiaccountview_LIB_SRCS} ) target_link_libraries( jamiaccountview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamiaccountview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiAccountViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiAccountView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiAccountViewConfig.cmake.in" ${jamiaccountview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAccountView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamiaccountview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAccountView/ COMPONENT Devel ) # Create the target target_include_directories(jamiaccountview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamiaccountview PROPERTIES PUBLIC_HEADER "${jamiaccountview_EXPORT_HDRS}" ) export(TARGETS jamiaccountview FILE "${PROJECT_BINARY_DIR}/cmake/JamiAccountViewTargets.cmake" ) install(TARGETS jamiaccountview EXPORT JamiAccountViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamiaccountview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiAccountViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAccountView COMPONENT Devel ) diff --git a/src/callview/CMakeLists.txt b/src/callview/CMakeLists.txt index a4773476..87ad9fb4 100644 --- a/src/callview/CMakeLists.txt +++ b/src/callview/CMakeLists.txt @@ -1,119 +1,130 @@ cmake_minimum_required(VERSION 3.0) project(jamicallview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMICALLVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamicallview_LIB_SRCS callviewplugin.cpp ) qt5_add_resources(jamicallview_LIB_SRCS callview.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamicallview) add_library(jamicallview ${jamicallview_LIB_SRCS} ) target_link_libraries( jamicallview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamicallview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiCallViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiCallView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiCallViewConfig.cmake.in" ${jamicallview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiCallView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamicallview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiCallView/ COMPONENT Devel ) # Create the target target_include_directories(jamicallview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamicallview PROPERTIES PUBLIC_HEADER "${jamicallview_EXPORT_HDRS}" ) export(TARGETS jamicallview FILE "${PROJECT_BINARY_DIR}/cmake/JamiCallViewTargets.cmake" ) install(TARGETS jamicallview EXPORT JamiCallViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamicallview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiCallViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiCallView COMPONENT Devel ) diff --git a/src/canvasindicators/CMakeLists.txt b/src/canvasindicators/CMakeLists.txt index 9a4e5145..ff04e241 100644 --- a/src/canvasindicators/CMakeLists.txt +++ b/src/canvasindicators/CMakeLists.txt @@ -1,120 +1,131 @@ cmake_minimum_required(VERSION 3.0) project(jamicanvasindicator) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMICANVASINDICATOR_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamicanvasindicator_LIB_SRCS ringingimageprovider.cpp canvasindicator.cpp ) qt5_add_resources(jamicanvasindicator_LIB_SRCS canvasindicator.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamicanvasindicator) add_library(jamicanvasindicator ${jamicanvasindicator_LIB_SRCS} ) target_link_libraries( jamicanvasindicator # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamicanvasindicator_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiCanvasIndicatorConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiCanvasIndicator_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiCanvasIndicatorConfig.cmake.in" ${jamicanvasindicator_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiCanvasIndicator/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamicanvasindicator_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiCanvasIndicator/ COMPONENT Devel ) # Create the target target_include_directories(jamicanvasindicator PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamicanvasindicator PROPERTIES PUBLIC_HEADER "${jamicanvasindicator_EXPORT_HDRS}" ) export(TARGETS jamicanvasindicator FILE "${PROJECT_BINARY_DIR}/cmake/JamiCanvasIndicatorTargets.cmake" ) install(TARGETS jamicanvasindicator EXPORT JamiCanvasIndicatorTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamicanvasindicator ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiCanvasIndicatorTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiCanvasIndicator COMPONENT Devel ) diff --git a/src/contactview/CMakeLists.txt b/src/contactview/CMakeLists.txt index 6ea12f85..630dd619 100644 --- a/src/contactview/CMakeLists.txt +++ b/src/contactview/CMakeLists.txt @@ -1,125 +1,136 @@ cmake_minimum_required(VERSION 3.0) project(jamicontactview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMICONTACTVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamicontactview_LIB_SRCS contactviewplugin.cpp contactphoto.cpp ) qt5_add_resources(jamicontactview_LIB_SRCS contactview.qrc ) include_directories(SYSTEM ${ringqt_INCLUDE_DIR}) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamicontactview) add_library(jamicontactview ${jamicontactview_LIB_SRCS} ) target_link_libraries( jamicontactview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 # KF5 KF5::ConfigWidgets # KColorScheme ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamicontactview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiContactViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiContactView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiContactViewConfig.cmake.in" ${jamicontactview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiContactView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamicontactview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiContactView/ COMPONENT Devel ) # Create the target target_include_directories(jamicontactview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamicontactview PROPERTIES PUBLIC_HEADER "${jamicontactview_EXPORT_HDRS}" ) export(TARGETS jamicontactview FILE "${PROJECT_BINARY_DIR}/cmake/JamiContactViewTargets.cmake" ) install(TARGETS jamicontactview EXPORT JamiContactViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamicontactview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiContactViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiContactView COMPONENT Devel ) diff --git a/src/dialview/CMakeLists.txt b/src/dialview/CMakeLists.txt index bdd77286..86672f88 100644 --- a/src/dialview/CMakeLists.txt +++ b/src/dialview/CMakeLists.txt @@ -1,119 +1,130 @@ cmake_minimum_required(VERSION 3.0) project(jamidialview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIDIALVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamidialview_LIB_SRCS dialviewplugin.cpp ) qt5_add_resources(jamidialview_LIB_SRCS dialview.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamidialview) add_library(jamidialview ${jamidialview_LIB_SRCS} ) target_link_libraries( jamidialview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamidialview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiDialViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiDialView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiDialViewConfig.cmake.in" ${jamidialview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiDialView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamidialview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiDialView/ COMPONENT Devel ) # Create the target target_include_directories(jamidialview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamidialview PROPERTIES PUBLIC_HEADER "${jamidialview_EXPORT_HDRS}" ) export(TARGETS jamidialview FILE "${PROJECT_BINARY_DIR}/cmake/JamiDialViewTargets.cmake" ) install(TARGETS jamidialview EXPORT JamiDialViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamidialview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiDialViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiDialView COMPONENT Devel ) diff --git a/src/genericutils/CMakeLists.txt b/src/genericutils/CMakeLists.txt index a2b95e9e..7509bf30 100644 --- a/src/genericutils/CMakeLists.txt +++ b/src/genericutils/CMakeLists.txt @@ -1,122 +1,133 @@ cmake_minimum_required(VERSION 3.0) project(genericutils) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DGENERICUTILS_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( genericutils_LIB_SRCS plugin.cpp treehelper.cpp fileloader.cpp symboliccolorizer.cpp ) qt5_add_resources(genericutils_LIB_SRCS qmlwidgets.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.genericutils) add_library(genericutils ${genericutils_LIB_SRCS} ) target_link_libraries( genericutils # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(genericutils_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/GenericUtilsConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(GenericUtils_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/GenericUtilsConfig.cmake.in" ${genericutils_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/GenericUtils/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${genericutils_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/GenericUtils/ COMPONENT Devel ) # Create the target target_include_directories(genericutils PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(genericutils PROPERTIES PUBLIC_HEADER "${genericutils_EXPORT_HDRS}" ) export(TARGETS genericutils FILE "${PROJECT_BINARY_DIR}/cmake/GenericUtilsTargets.cmake" ) install(TARGETS genericutils EXPORT GenericUtilsTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT genericutils ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT GenericUtilsTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/GenericUtils COMPONENT Devel ) diff --git a/src/jamiaudioplayer/CMakeLists.txt b/src/jamiaudioplayer/CMakeLists.txt index b30b258d..ed086122 100644 --- a/src/jamiaudioplayer/CMakeLists.txt +++ b/src/jamiaudioplayer/CMakeLists.txt @@ -1,119 +1,130 @@ cmake_minimum_required(VERSION 3.0) project(jamiaudioplayer) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIJAMIAUDIOPLAYER_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamiaudioplayer_LIB_SRCS plugin.cpp ) qt5_add_resources(jamiaudioplayer_LIB_SRCS jamiaudioplayer.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamiaudioplayer) add_library(jamiaudioplayer ${jamiaudioplayer_LIB_SRCS} ) target_link_libraries( jamiaudioplayer # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamiaudioplayer_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiAudioPlayerConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiAudioPlayer_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiAudioPlayerConfig.cmake.in" ${jamiaudioplayer_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAudioPlayer/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamiaudioplayer_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAudioPlayer/ COMPONENT Devel ) # Create the target target_include_directories(jamiaudioplayer PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamiaudioplayer PROPERTIES PUBLIC_HEADER "${jamiaudioplayer_EXPORT_HDRS}" ) export(TARGETS jamiaudioplayer FILE "${PROJECT_BINARY_DIR}/cmake/JamiAudioPlayerTargets.cmake" ) install(TARGETS jamiaudioplayer EXPORT JamiAudioPlayerTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamiaudioplayer ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiAudioPlayerTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiAudioPlayer COMPONENT Devel ) diff --git a/src/jamichatview/CMakeLists.txt b/src/jamichatview/CMakeLists.txt index bf431543..e42df8ca 100644 --- a/src/jamichatview/CMakeLists.txt +++ b/src/jamichatview/CMakeLists.txt @@ -1,120 +1,131 @@ cmake_minimum_required(VERSION 3.0) project(jamichatview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIJAMICHATVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamichatview_LIB_SRCS plugin.cpp bubble.cpp ) qt5_add_resources(jamichatview_LIB_SRCS jamichatview.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamichatview) add_library(jamichatview ${jamichatview_LIB_SRCS} ) target_link_libraries( jamichatview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamichatview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiChatViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiChatView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiChatViewConfig.cmake.in" ${jamichatview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiChatView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamichatview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiChatView/ COMPONENT Devel ) # Create the target target_include_directories(jamichatview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamichatview PROPERTIES PUBLIC_HEADER "${jamichatview_EXPORT_HDRS}" ) export(TARGETS jamichatview FILE "${PROJECT_BINARY_DIR}/cmake/JamiChatViewTargets.cmake" ) install(TARGETS jamichatview EXPORT JamiChatViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamichatview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiChatViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiChatView COMPONENT Devel ) diff --git a/src/jamihistoryview/CMakeLists.txt b/src/jamihistoryview/CMakeLists.txt index 1c472278..684bbcf4 100644 --- a/src/jamihistoryview/CMakeLists.txt +++ b/src/jamihistoryview/CMakeLists.txt @@ -1,119 +1,130 @@ cmake_minimum_required(VERSION 3.0) project(jamihistoryview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIJAMIHISTORYVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamihistoryview_LIB_SRCS plugin.cpp ) qt5_add_resources(jamihistoryview_LIB_SRCS jamihistoryview.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamihistoryview) add_library(jamihistoryview ${jamihistoryview_LIB_SRCS} ) target_link_libraries( jamihistoryview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamihistoryview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiHistoryViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiHistoryView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiHistoryViewConfig.cmake.in" ${jamihistoryview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiHistoryView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamihistoryview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiHistoryView/ COMPONENT Devel ) # Create the target target_include_directories(jamihistoryview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamihistoryview PROPERTIES PUBLIC_HEADER "${jamihistoryview_EXPORT_HDRS}" ) export(TARGETS jamihistoryview FILE "${PROJECT_BINARY_DIR}/cmake/JamiHistoryViewTargets.cmake" ) install(TARGETS jamihistoryview EXPORT JamiHistoryViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamihistoryview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiHistoryViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiHistoryView COMPONENT Devel ) diff --git a/src/jamikdeintegration/CMakeLists.txt b/src/jamikdeintegration/CMakeLists.txt index 490ea1b5..bf65ecdb 100644 --- a/src/jamikdeintegration/CMakeLists.txt +++ b/src/jamikdeintegration/CMakeLists.txt @@ -1,223 +1,234 @@ cmake_minimum_required(VERSION 3.0) project(jamikdeintegration) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) IF(${CMAKE_SYSTEM_NAME} MATCHES "Android") SET(OS_ANDROID 1) ENDIF() IF(DEFINED OS_ANDROID) SET(ENABLE_NOTIFICATIONS OFF) ENDIF() find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") #FIXME # find_package(KF5 QUIET COMPONENTS # Akonadi # AkonadiContact # Contacts # ) include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() if(NOT BUILD_SHARED_LIBS) set(ENABLE__STATIC_PLUGIN 1) else() set(ENABLE__STATIC_PLUGIN 0) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(ENABLE__STATIC_PLUGIN) add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIKDEINTEGRATION_USE_STATIC_PLUGIN=1) endif(ENABLE__STATIC_PLUGIN) find_package(Qt5 CONFIG REQUIRED Core Gui Quick Widgets QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") # Pack the icons shared by various components ADD_SUBDIRECTORY( sharedassets ) #File to compile set( jamikdeintegration_LIB_SRCS src/colorinterface.cpp src/shortcutinterface.cpp src/actioninterface.cpp src/fileproverderinterface.cpp src/pixmapinterface.cpp src/serializationinterface.cpp src/actioncollection.cpp src/windowevent.cpp src/cmiconengine.cpp src/personiconengine.cpp src/qmlaction.cpp src/qactionbinder.cpp src/plugin.cpp ) if(ENABLE_NOTIFICATIONS) set( jamikdeintegration_LIB_SRCS ${jamikdeintegration_LIB_SRCS} src/systray.cpp ) endif() if(Qt5TextToSpeech_FOUND) set( jamikdeintegration_LIB_SRCS ${jamikdeintegration_LIB_SRCS} accessibility.cpp ) endif() # if(KF5_AKONADI_FOUND AND KF5_AKONADICONTACT_FOUND AND KF5_CONTACTS_FOUND) # set(AKONADI_FOUND 1) # endif() # IF ( KF5_AKONADI_FOUND AND KF5_AKONADICONTACT_FOUND AND KF5_CONTACTS_FOUND) # ADD_DEFINITIONS("-DENABLE_AKONADI=1") # ENDIF() # if( ${AKONADI_FOUND} ) # set(jamikdeintegration_LIB_SRCS # ${jamikdeintegration_LIB_SRCS} # akonadibackend.cpp # ) # endif() include_directories(SYSTEM ${ringqt_INCLUDE_DIR}) if(NOT ENABLE_NOTIFICATIONS) add_definitions(-DDISABLE_NOTIFICATION=1) endif() kconfig_add_kcfg_files (jamikdeintegration_LIB_SRCS kcfg_settings.kcfgc) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamikdeintegration) add_library(jamikdeintegration ${jamikdeintegration_LIB_SRCS} ) target_link_libraries( jamikdeintegration # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::Widgets Qt5::QuickControls2 # KF5 KF5::I18n KF5::ConfigCore KF5::ConfigGui KF5::ConfigWidgets # KColorScheme KF5::XmlGui # KSortcutdialog # (DESKTOP) KF5::GlobalAccel # (DESKTOP) ) if(ENABLE_NOTIFICATIONS) target_link_libraries( jamikdeintegration KF5::NotifyConfig # the notification dialog # (DESKTOP) KF5::Notifications # the Systray ) endif() #FIXME # if ( ${AKONADI_FOUND} ) # target_link_libraries( jamikdeintegration # KF5::AkonadiCore # KF5::AkonadiContact # KF5::Contacts # ) # endif() set(jamikdeintegration_EXPORT_HDRS src/actioncollection.h src/windowevent.h src/plugin.h ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamikdeintegration_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiKDEIntegrationConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiKDEIntegration_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiKDEIntegrationConfig.cmake.in" ${jamikdeintegration_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiKDEIntegration/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamikdeintegration_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiKDEIntegration/ COMPONENT Devel ) # Create the target target_include_directories(jamikdeintegration PUBLIC # $ $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamikdeintegration PROPERTIES PUBLIC_HEADER "${jamikdeintegration_EXPORT_HDRS}" ) export(TARGETS jamikdeintegration FILE "${PROJECT_BINARY_DIR}/cmake/JamiKDEIntegrationTargets.cmake" ) install(TARGETS jamikdeintegration EXPORT JamiKDEIntegrationTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamikdeintegration ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiKDEIntegrationTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiKDEIntegration COMPONENT Devel ) install(FILES ring-kde.kcfg DESTINATION ${KCFG_INSTALL_DIR}) diff --git a/src/jaminotification/CMakeLists.txt b/src/jaminotification/CMakeLists.txt index 375d4a66..141af0f4 100644 --- a/src/jaminotification/CMakeLists.txt +++ b/src/jaminotification/CMakeLists.txt @@ -1,123 +1,134 @@ cmake_minimum_required(VERSION 3.0) project(jaminotification) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMINOTIFICATION_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jaminotification_LIB_SRCS plugin.cpp notification.cpp focuslistener.cpp ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jaminotification) include_directories(SYSTEM ${ringqt_INCLUDE_DIR}) add_library(jaminotification ${jaminotification_LIB_SRCS} ) target_link_libraries( jaminotification # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 # KF5 KF5::Notifications KF5::I18n ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jaminotification_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiNotificationConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiNotification_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiNotificationConfig.cmake.in" ${jaminotification_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiNotification/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jaminotification_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiNotification/ COMPONENT Devel ) # Create the target target_include_directories(jaminotification PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jaminotification PROPERTIES PUBLIC_HEADER "${jaminotification_EXPORT_HDRS}" ) export(TARGETS jaminotification FILE "${PROJECT_BINARY_DIR}/cmake/JamiNotificationTargets.cmake" ) install(TARGETS jaminotification EXPORT JamiNotificationTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jaminotification ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiNotificationTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiNotification COMPONENT Devel ) diff --git a/src/jamisearch/CMakeLists.txt b/src/jamisearch/CMakeLists.txt index 75216d3e..b90b7a4d 100644 --- a/src/jamisearch/CMakeLists.txt +++ b/src/jamisearch/CMakeLists.txt @@ -1,125 +1,136 @@ cmake_minimum_required(VERSION 3.0) project(jamisearch) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMISEARCH_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamisearch_LIB_SRCS jamisearchplugin.cpp tipmodel.cpp ) qt5_add_resources(jamisearch_LIB_SRCS jamisearch.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamisearch) add_library(jamisearch ${jamisearch_LIB_SRCS} ) target_link_libraries( jamisearch # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 # KF5 KF5::I18n KF5::ConfigCore KF5::ConfigGui ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamisearch_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiSearchConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiSearch_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiSearchConfig.cmake.in" ${jamisearch_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiSearch/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamisearch_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiSearch/ COMPONENT Devel ) # Create the target target_include_directories(jamisearch PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamisearch PROPERTIES PUBLIC_HEADER "${jamisearch_EXPORT_HDRS}" ) export(TARGETS jamisearch FILE "${PROJECT_BINARY_DIR}/cmake/JamiSearchTargets.cmake" ) install(TARGETS jamisearch EXPORT JamiSearchTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamisearch ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiSearchTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiSearch COMPONENT Devel ) diff --git a/src/jamitimeline/CMakeLists.txt b/src/jamitimeline/CMakeLists.txt index db5da67f..4676c51a 100644 --- a/src/jamitimeline/CMakeLists.txt +++ b/src/jamitimeline/CMakeLists.txt @@ -1,122 +1,133 @@ cmake_minimum_required(VERSION 3.0) project(jamitimelineview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMITIMELINEVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamitimelineview_LIB_SRCS timelineplugin.cpp ) qt5_add_resources(jamitimelineview_LIB_SRCS recentdock.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamitimelineview) add_library(jamitimelineview ${jamitimelineview_LIB_SRCS} ) target_link_libraries( jamitimelineview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 # KF5 KF5::I18n ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamitimelineview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiTimelineViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiTimelineView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiTimelineViewConfig.cmake.in" ${jamitimelineview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTimelineView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamitimelineview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTimelineView/ COMPONENT Devel ) # Create the target target_include_directories(jamitimelineview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamitimelineview PROPERTIES PUBLIC_HEADER "${jamitimelineview_EXPORT_HDRS}" ) export(TARGETS jamitimelineview FILE "${PROJECT_BINARY_DIR}/cmake/JamiTimelineViewTargets.cmake" ) install(TARGETS jamitimelineview EXPORT JamiTimelineViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamitimelineview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiTimelineViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTimelineView COMPONENT Devel ) diff --git a/src/jamitimelinebase/CMakeLists.txt b/src/jamitimelinebase/CMakeLists.txt index 714fce58..72a5c9e1 100644 --- a/src/jamitimelinebase/CMakeLists.txt +++ b/src/jamitimelinebase/CMakeLists.txt @@ -1,122 +1,129 @@ cmake_minimum_required(VERSION 3.0) project(jamitimelinebase) set(GENERIC_LIB_VERSION "1.0.0") if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIJAMITIMELINEBASE_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) #File to compile set( jamitimelinebase_LIB_SRCS plugin.cpp multicall.cpp timelinedots.cpp ) qt5_add_resources(jamitimelinebase_LIB_SRCS jamitimelinebase.qrc ) include_directories(SYSTEM ${ringqt_INCLUDE_DIR}) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamitimelinebase) add_library(jamitimelinebase ${jamitimelinebase_LIB_SRCS} ) target_link_libraries( jamitimelinebase # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamitimelinebase_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiTimelineBaseConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiTimelineBase_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiTimelineBaseConfig.cmake.in" ${jamitimelinebase_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTimelineBase/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamitimelinebase_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTimelineBase/ COMPONENT Devel ) # Create the target target_include_directories(jamitimelinebase PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamitimelinebase PROPERTIES PUBLIC_HEADER "${jamitimelinebase_EXPORT_HDRS}" ) export(TARGETS jamitimelinebase FILE "${PROJECT_BINARY_DIR}/cmake/JamiTimelineBaseTargets.cmake" ) install(TARGETS jamitimelinebase EXPORT JamiTimelineBaseTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamitimelinebase ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiTimelineBaseTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTimelineBase COMPONENT Devel ) diff --git a/src/jamitroubleshooting/CMakeLists.txt b/src/jamitroubleshooting/CMakeLists.txt index 83494ecf..2d468a56 100644 --- a/src/jamitroubleshooting/CMakeLists.txt +++ b/src/jamitroubleshooting/CMakeLists.txt @@ -1,119 +1,130 @@ cmake_minimum_required(VERSION 3.0) project(jamitroubleshooting) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIJAMITROUBLESHOOTING_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamitroubleshooting_LIB_SRCS plugin.cpp ) qt5_add_resources(jamitroubleshooting_LIB_SRCS jamitroubleshooting.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamitroubleshooting) add_library(jamitroubleshooting ${jamitroubleshooting_LIB_SRCS} ) target_link_libraries( jamitroubleshooting # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamitroubleshooting_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiTroubleshootingConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiTroubleshooting_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiTroubleshootingConfig.cmake.in" ${jamitroubleshooting_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTroubleshooting/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamitroubleshooting_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTroubleshooting/ COMPONENT Devel ) # Create the target target_include_directories(jamitroubleshooting PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamitroubleshooting PROPERTIES PUBLIC_HEADER "${jamitroubleshooting_EXPORT_HDRS}" ) export(TARGETS jamitroubleshooting FILE "${PROJECT_BINARY_DIR}/cmake/JamiTroubleshootingTargets.cmake" ) install(TARGETS jamitroubleshooting EXPORT JamiTroubleshootingTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamitroubleshooting ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiTroubleshootingTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiTroubleshooting COMPONENT Devel ) diff --git a/src/jamivideoview/CMakeLists.txt b/src/jamivideoview/CMakeLists.txt index 1275c10a..d274f70a 100644 --- a/src/jamivideoview/CMakeLists.txt +++ b/src/jamivideoview/CMakeLists.txt @@ -1,123 +1,134 @@ cmake_minimum_required(VERSION 3.0) project(jamivideoview) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIJAMIVIDEOVIEW_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamivideoview_LIB_SRCS plugin.cpp imageprovider.cpp snapshotadapter.cpp ) qt5_add_resources(jamivideoview_LIB_SRCS jamivideo.qrc ) include_directories(SYSTEM ${ringqt_INCLUDE_DIR}) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamivideoview) add_library(jamivideoview ${jamivideoview_LIB_SRCS} ) target_link_libraries( jamivideoview # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamivideoview_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiVideoViewConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiVideoView_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiVideoViewConfig.cmake.in" ${jamivideoview_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiVideoView/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamivideoview_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiVideoView/ COMPONENT Devel ) # Create the target target_include_directories(jamivideoview PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamivideoview PROPERTIES PUBLIC_HEADER "${jamivideoview_EXPORT_HDRS}" ) export(TARGETS jamivideoview FILE "${PROJECT_BINARY_DIR}/cmake/JamiVideoViewTargets.cmake" ) install(TARGETS jamivideoview EXPORT JamiVideoViewTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamivideoview ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiVideoViewTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiVideoView COMPONENT Devel ) diff --git a/src/photoselector/CMakeLists.txt b/src/photoselector/CMakeLists.txt index 0690f8bf..ae59c926 100644 --- a/src/photoselector/CMakeLists.txt +++ b/src/photoselector/CMakeLists.txt @@ -1,125 +1,136 @@ cmake_minimum_required(VERSION 3.0) project(jamiphotoselector) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIPHOTOSELECTOR_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamiphotoselector_LIB_SRCS photoselector.cpp photoplugin.cpp ) qt5_add_resources(jamiphotoselector_LIB_SRCS photoselector.qrc ) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamiphotoselector) include_directories(SYSTEM ${ringqt_INCLUDE_DIR}) add_library(jamiphotoselector ${jamiphotoselector_LIB_SRCS} ) target_link_libraries( jamiphotoselector # Project ringqt ringqtquick # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 # KF5 KF5::I18n ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamiphotoselector_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiPhotoSelectorConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiPhotoSelector_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiPhotoSelectorConfig.cmake.in" ${jamiphotoselector_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiPhotoSelector/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamiphotoselector_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiPhotoSelector/ COMPONENT Devel ) # Create the target target_include_directories(jamiphotoselector PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamiphotoselector PROPERTIES PUBLIC_HEADER "${jamiphotoselector_EXPORT_HDRS}" ) export(TARGETS jamiphotoselector FILE "${PROJECT_BINARY_DIR}/cmake/JamiPhotoSelectorTargets.cmake" ) install(TARGETS jamiphotoselector EXPORT JamiPhotoSelectorTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamiphotoselector ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiPhotoSelectorTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiPhotoSelector COMPONENT Devel ) diff --git a/src/wizard/CMakeLists.txt b/src/wizard/CMakeLists.txt index e2008d10..68ac6a3f 100644 --- a/src/wizard/CMakeLists.txt +++ b/src/wizard/CMakeLists.txt @@ -1,130 +1,141 @@ cmake_minimum_required(VERSION 3.0) project(jamiwizard) if(POLICY CMP0063) CMAKE_POLICY(SET CMP0063 NEW) endif(POLICY CMP0063) find_package(ECM 1.1.0 REQUIRED NO_MODULE) list(APPEND CMAKE_MODULE_PATH "${ECM_MODULE_PATH}") include(ECMInstallIcons) include(ECMOptionalAddSubdirectory) include(CMakePackageConfigHelpers) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings) SET(CMAKE_C_VISIBILITY_PRESET hidden) SET(CMAKE_CXX_VISIBILITY_PRESET hidden) SET(CMAKE_VISIBILITY_INLINES_HIDDEN 1) # When used with `add_subdirectory`, assume it is a static Qt plugin get_directory_property(USES_ADD_SUBDIRECTORY PARENT_DIRECTORY) if(USES_ADD_SUBDIRECTORY) set(BUILD_SHARED_LIBS OFF) endif() set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) if(NOT BUILD_SHARED_LIBS) set(ENABLE_STATIC_PLUGIN 1) # Used in Config.cmake.in add_definitions(-DQT_PLUGIN) add_definitions(-DQT_STATICPLUGIN=1) add_definitions(-DJAMIWIZARD_USE_STATIC_PLUGIN=1) endif() find_package(Qt5 CONFIG REQUIRED Core Gui Quick QuickControls2 ) +if(X11_FOUND) + find_package(Qt5 QUIET OPTIONAL_COMPONENTS Qt5::X11Extras) +endif() + set(GENERIC_LIB_VERSION "1.0.0") #File to compile set( jamiwizard_LIB_SRCS welcome.cpp policies.cpp plugin.cpp ) qt5_add_resources(jamiwizard_LIB_SRCS wizard.qrc ) include_directories(SYSTEM ${ringqt_INCLUDE_DIR}) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.ringkde.jamiwizard) add_library(jamiwizard ${jamiwizard_LIB_SRCS} ) target_link_libraries( jamiwizard jamikdeintegration ringqt # Project ringqt ringqtquick # KF5 KF5::ConfigCore KF5::ConfigGui # Qt Qt5::Core Qt5::Gui Qt5::Quick Qt5::QuickControls2 ) +if(X11_FOUND) + target_link_libraries( jamiaccountview + Qt5::X11Extras + ${X11_X11_LIB} + ) +endif() + # Configure the target config set(jamiwizard_CONFIG_PATH "${CMAKE_CURRENT_BINARY_DIR}/JamiWizardConfig.cmake") if(USES_ADD_SUBDIRECTORY) set(JamiWizard_DIR ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) endif() configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/JamiWizardConfig.cmake.in" ${jamiwizard_CONFIG_PATH} INSTALL_DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiWizard/ PATH_VARS INCLUDE_INSTALL_DIR ) install( FILES ${jamiwizard_CONFIG_PATH} DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiWizard/ COMPONENT Devel ) # Create the target target_include_directories(jamiwizard PUBLIC $ PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/ ) set_target_properties(jamiwizard PROPERTIES PUBLIC_HEADER "${jamiwizard_EXPORT_HDRS}" ) export(TARGETS jamiwizard FILE "${PROJECT_BINARY_DIR}/cmake/JamiWizardTargets.cmake" ) install(TARGETS jamiwizard EXPORT JamiWizardTargets LIBRARY DESTINATION "${CMAKE_INSTALL_FULL_LIBDIR}" COMPONENT jamiwizard ARCHIVE DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin COMPONENT Devel ) install(EXPORT JamiWizardTargets DESTINATION ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/JamiWizard COMPONENT Devel )