No OneTemporary
Actions

Size

21 KB

Subscribers

None

View Options

	diff --git a/CMakeLists.txt b/CMakeLists.txt
	index 852927e13..fd21617bf 100644
	--- a/CMakeLists.txt
	+++ b/CMakeLists.txt
	@@ -1,177 +1,177 @@
	set(kleopatra_version 3.1.14)
	# The following is for Windows. Keep in line with kleopatra_version.
	set(kleopatra_fileversion 3,1,14,0)
	cmake_minimum_required(VERSION 3.5)
	project(kleopatra VERSION ${kleopatra_version})

	# The RELEASE_SERVICE_VERSION is used by Gpg4win to add the Gpg4win version
	if (NOT RELEASE_SERVICE_VERSION)
	set (RELEASE_SERVICE_VERSION "21.03.80")
	endif()

	option(FORCE_DISABLE_KCMUTILS "Force building Kleopatra without KCMUtils. Doing this will disable configuration KCM Plugins. [default=OFF]" OFF)
	option(DISABLE_KWATCHGNUPG "Don't build the kwatchgnupg tool [default=OFF]" OFF)

	# Standalone build. Find / include everything necessary.
	set(KF5_MIN_VERSION "5.77.0")
	set(KMIME_VERSION "5.16.40")
	set(LIBKLEO_VERSION "5.16.42")
	set(QT_REQUIRED_VERSION "5.13.0")
	set(GPGME_REQUIRED_VERSION "1.13.1")

	if (WIN32)
	set(KF5_WANT_VERSION "5.70.0")
	set(KMIME_WANT_VERSION "5.12.0")
	else ()
	set(KF5_WANT_VERSION ${KF5_MIN_VERSION})
	set(KMIME_WANT_VERSION ${KMIME_VERSION})
	endif ()

	find_package(ECM ${KF5_WANT_VERSION} CONFIG REQUIRED)
	set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
	set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH})


	include(ECMInstallIcons)
	include(ECMSetupVersion)
	include(ECMAddTests)

	include(GenerateExportHeader)
	include(ECMGenerateHeaders)

	include(FeatureSummary)
	include(CheckFunctionExists)
	include(ECMGeneratePriFile)

	include(KDEInstallDirs)
	include(KDECMakeSettings)
	include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
	include(ECMAddAppIcon)
	include(ECMQtDeclareLoggingCategory)

	# Find KF5 packages
	if (NOT FORCE_DISABLE_KCMUTILS)
	find_package(KF5KCMUtils ${KF5_WANT_VERSION} CONFIG REQUIRED)
	endif()
	find_package(KF5WidgetsAddons ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5ConfigWidgets ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5CoreAddons ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5Codecs ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5Config ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5I18n ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5IconThemes ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5ItemModels ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5XmlGui ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5WindowSystem ${KF5_WANT_VERSION} CONFIG REQUIRED)
	find_package(KF5DocTools ${KF5_WANT_VERSION} CONFIG)
	find_package(KF5Crash ${KF5_WANT_VERSION} REQUIRED)

	set_package_properties(KF5DocTools PROPERTIES DESCRIPTION "Documentation tools" TYPE OPTIONAL PURPOSE "Required to generate Kleopatra documentation.")

	# Optional packages
	if (WIN32)
	# Only a replacement available for Windows so this
	# is required on other platforms.
	find_package(KF5DBusAddons ${KF5_WANT_VERSION} CONFIG)
	set_package_properties(KF5DBusAddons PROPERTIES DESCRIPTION "Support library to work with DBus"
	PURPOSE "DBus session integration"
	URL "https://inqlude.org/libraries/kdbusaddons.html"
	TYPE OPTIONAL)
	else()
	find_package(KF5DBusAddons ${KF5_WANT_VERSION} CONFIG REQUIRED)
	set(_kleopatra_dbusaddons_libs KF5::DBusAddons)
	endif()

	set(HAVE_QDBUS ${Qt5DBus_FOUND})

	find_package(Gpgmepp ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)
	find_package(QGpgme ${GPGME_REQUIRED_VERSION} CONFIG REQUIRED)

	# Kdepimlibs packages
	find_package(KF5Libkleo ${LIBKLEO_VERSION} CONFIG REQUIRED)
	find_package(KF5Mime ${KMIME_WANT_VERSION} CONFIG REQUIRED)

	find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Network PrintSupport)

	find_package(Assuan2 REQUIRED)

	set(HAVE_KCMUTILS ${KF5KCMUtils_FOUND})
	set(CMAKE_CXX_STANDARD 14)
	set(CMAKE_CXX_STANDARD_REQUIRED ON)


	find_package(Boost 1.34.0 REQUIRED)

	find_path(Boost_TOPOLOGICAL_SORT_DIR NAMES boost/graph/topological_sort.hpp PATHS ${Boost_INCLUDE_DIRS})
	if(NOT Boost_TOPOLOGICAL_SORT_DIR)
	message(FATAL_ERROR "The Boost Topological_sort header was NOT found. Should be part of Boost graph module.")
	endif()

	set(kleopatra_release FALSE)

	if(NOT kleopatra_release)
	if(GIT_FOUND)
	execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --oneline --format=%h ${CMAKE_CURRENT_SOURCE_DIR}
	WORKING_DIRECTORY ${kdepim_SOURCE_DIR}/kleopatra
	OUTPUT_VARIABLE Kleopatra_WC_REVISION)
	string(REGEX REPLACE "\n" "" Kleopatra_WC_REVISION "${Kleopatra_WC_REVISION}")

	execute_process(COMMAND ${GIT_EXECUTABLE} log -1 --oneline --format=%ci ${CMAKE_CURRENT_SOURCE_DIR}
	WORKING_DIRECTORY ${kdepim_SOURCE_DIR}/kleopatra
	OUTPUT_VARIABLE Kleopatra_WC_LAST_CHANGED_DATE)
	string(REGEX REPLACE " [-0-9:+ ]*\n" "" Kleopatra_WC_LAST_CHANGED_DATE "${Kleopatra_WC_LAST_CHANGED_DATE}")

	set(kleopatra_version "${kleopatra_version}-git${Kleopatra_WC_REVISION} (${Kleopatra_WC_LAST_CHANGED_DATE})")
	endif()
	endif()

	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-kleopatra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kleopatra.h)

	include (ConfigureChecks.cmake)

	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-kleopatra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kleopatra.h)
	include_directories(
	${CMAKE_CURRENT_BINARY_DIR}
	${CMAKE_CURRENT_SOURCE_DIR}
	${Boost_INCLUDE_DIR}
	${ASSUAN2_INCLUDES}
	)

	add_definitions(-D_ASSUAN_ONLY_GPG_ERRORS)
	#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00)
	add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x054E00)
	if(CMAKE_COMPILER_IS_GNUCXX)
	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-missing-braces -Wno-parentheses -Wno-ignored-qualifiers")
	endif()
	add_definitions(-DQT_NO_EMIT)

	kde_enable_exceptions()
	#Laurent: disable for the moment
	-#option(USE_UNIFY_CMAKE_SUPPORT "Use UNIFY cmake support (speedup compile time)" FALSE)
	+#option(USE_UNITY_CMAKE_SUPPORT "Use UNITY cmake support (speedup compile time)" FALSE)

	-#set(COMPILE_WITH_CMAKE_SUPPORT false)
	-#if (USE_UNIFY_CMAKE_SUPPORT)
	+#set(COMPILE_WITH_UNITY_CMAKE_SUPPORT false)
	+#if (USE_UNITY_CMAKE_SUPPORT)
	# if(${CMAKE_VERSION} VERSION_LESS "3.16.0")
	# message(STATUS "CMAKE version is less than 3.16.0 . We can't use cmake unify build support")
	# else()
	-# set(COMPILE_WITH_CMAKE_SUPPORT true)
	+# set(COMPILE_WITH_UNITY_CMAKE_SUPPORT true)
	# endif()
	#endif()

	add_subdirectory(pics)
	add_subdirectory(src)

	if(BUILD_TESTING)
	add_subdirectory(tests)
	add_subdirectory(autotests)
	endif()

	ecm_qt_install_logging_categories(
	EXPORT KLEOPATRA
	FILE kleopatra.categories
	DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
	)

	if(KF5DocTools_FOUND)
	add_subdirectory(doc)
	endif()
	diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
	index 3a6fe7cfd..a1d4aba4c 100644
	--- a/src/CMakeLists.txt
	+++ b/src/CMakeLists.txt
	@@ -1,375 +1,375 @@
	add_subdirectory(icons)

	include_directories(${CMAKE_CURRENT_BINARY_DIR})
	include_directories(${CMAKE_CURRENT_SOURCE_DIR})

	if (NOT DISABLE_KWATCHGNUPG)
	add_subdirectory(kwatchgnupg)
	endif()
	add_subdirectory(libkleopatraclient)
	add_subdirectory(conf)
	add_subdirectory(kconf_update)

	if(WIN32)
	set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_win.cpp)
	set(_kleopatra_extra_SRCS
	utils/gnupg-registry.c
	selftest/registrycheck.cpp
	utils/windowsprocessdevice.cpp
	)
	else()
	set(_kleopatra_extra_uiserver_SRCS uiserver/uiserver_unix.cpp)
	set(_kleopatra_extra_SRCS)
	endif()

	set(_kleopatra_uiserver_SRCS
	uiserver/sessiondata.cpp
	uiserver/uiserver.cpp
	${_kleopatra_extra_uiserver_SRCS}
	uiserver/assuanserverconnection.cpp
	uiserver/echocommand.cpp
	uiserver/decryptverifycommandemailbase.cpp
	uiserver/decryptverifycommandfilesbase.cpp
	uiserver/signcommand.cpp
	uiserver/signencryptfilescommand.cpp
	uiserver/prepencryptcommand.cpp
	uiserver/prepsigncommand.cpp
	uiserver/encryptcommand.cpp
	uiserver/selectcertificatecommand.cpp
	uiserver/importfilescommand.cpp
	uiserver/createchecksumscommand.cpp
	uiserver/verifychecksumscommand.cpp

	selftest/uiservercheck.cpp
	)

	if(ASSUAN2_FOUND)
	include_directories(${ASSUAN2_INCLUDES})
	set(_kleopatra_uiserver_extra_libs ${ASSUAN2_LIBRARIES})
	else()
	include_directories(${ASSUAN_INCLUDES})
	if(WIN32)
	set(_kleopatra_uiserver_extra_libs ${ASSUAN_VANILLA_LIBRARIES})
	else()
	set(_kleopatra_uiserver_extra_libs ${ASSUAN_PTHREAD_LIBRARIES})
	endif()
	endif()

	if(HAVE_GPG_ERR_SOURCE_KLEO)
	add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
	add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_KLEO)
	else()
	add_definitions(-DGPG_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
	add_definitions(-DGPGMEPP_ERR_SOURCE_DEFAULT=GPG_ERR_SOURCE_USER_1)
	endif()

	ki18n_wrap_ui(_kleopatra_uiserver_SRCS crypto/gui/signingcertificateselectionwidget.ui)

	if("${Gpgmepp_VERSION}" VERSION_GREATER_EQUAL "1.14.1")
	set(_kleopatra_deviceinfowatcher_files
	smartcard/deviceinfowatcher.cpp
	)
	else()
	set(_kleopatra_deviceinfowatcher_files)
	endif()

	set(_kleopatra_SRCS
	utils/gui-helper.cpp
	utils/filedialog.cpp
	utils/kdpipeiodevice.cpp
	utils/headerview.cpp
	utils/scrollarea.cpp
	utils/dragqueen.cpp
	utils/multivalidator.cpp
	utils/systemtrayicon.cpp

	utils/hex.cpp
	utils/path-helper.cpp
	utils/input.cpp
	utils/output.cpp
	utils/validation.cpp
	utils/wsastarter.cpp
	utils/iodevicelogger.cpp
	utils/log.cpp
	utils/action_data.cpp
	utils/types.cpp
	utils/archivedefinition.cpp
	utils/auditlog.cpp
	utils/clipboardmenu.cpp
	utils/kuniqueservice.cpp
	utils/remarks.cpp
	utils/writecertassuantransaction.cpp
	utils/keyparameters.cpp

	selftest/selftest.cpp
	selftest/enginecheck.cpp
	selftest/gpgconfcheck.cpp
	selftest/gpgagentcheck.cpp
	selftest/libkleopatrarccheck.cpp

	${_kleopatra_extra_SRCS}

	view/keylistcontroller.cpp
	view/keytreeview.cpp
	view/searchbar.cpp
	view/smartcardwidget.cpp
	view/padwidget.cpp
	view/pgpcardwidget.cpp
	view/pivcardwidget.cpp
	view/netkeywidget.cpp
	view/nullpinwidget.cpp
	view/tabwidget.cpp
	view/keycacheoverlay.cpp
	view/waitwidget.cpp
	view/welcomewidget.cpp

	dialogs/certificateselectiondialog.cpp
	dialogs/certifywidget.cpp
	dialogs/expirydialog.cpp
	dialogs/lookupcertificatesdialog.cpp
	dialogs/ownertrustdialog.cpp
	dialogs/selftestdialog.cpp
	dialogs/certifycertificatedialog.cpp
	dialogs/revokecertificationwidget.cpp
	dialogs/revokecertificationdialog.cpp
	dialogs/adduseriddialog.cpp
	dialogs/addemaildialog.cpp
	dialogs/exportcertificatesdialog.cpp
	dialogs/deletecertificatesdialog.cpp
	dialogs/setinitialpindialog.cpp
	dialogs/certificatedetailswidget.cpp
	dialogs/trustchainwidget.cpp
	dialogs/weboftrustwidget.cpp
	dialogs/weboftrustdialog.cpp
	dialogs/exportdialog.cpp
	dialogs/subkeyswidget.cpp
	dialogs/gencardkeydialog.cpp
	dialogs/updatenotification.cpp
	dialogs/pivcardapplicationadministrationkeyinputdialog.cpp
	dialogs/certificatedetailsinputwidget.cpp
	dialogs/createcsrforcardkeydialog.cpp
	dialogs/csrcreationresultdialog.cpp

	crypto/controller.cpp
	crypto/certificateresolver.cpp
	crypto/sender.cpp
	crypto/recipient.cpp
	crypto/task.cpp
	crypto/taskcollection.cpp
	crypto/decryptverifytask.cpp
	crypto/decryptverifyemailcontroller.cpp
	crypto/decryptverifyfilescontroller.cpp
	crypto/autodecryptverifyfilescontroller.cpp
	crypto/encryptemailtask.cpp
	crypto/encryptemailcontroller.cpp
	crypto/newsignencryptemailcontroller.cpp
	crypto/signencrypttask.cpp
	crypto/signencryptfilescontroller.cpp
	crypto/signemailtask.cpp
	crypto/signemailcontroller.cpp
	crypto/createchecksumscontroller.cpp
	crypto/verifychecksumscontroller.cpp

	crypto/gui/wizard.cpp
	crypto/gui/wizardpage.cpp

	crypto/gui/certificateselectionline.cpp
	crypto/gui/certificatelineedit.cpp
	crypto/gui/signingcertificateselectionwidget.cpp
	crypto/gui/signingcertificateselectiondialog.cpp

	crypto/gui/resultitemwidget.cpp
	crypto/gui/resultlistwidget.cpp
	crypto/gui/resultpage.cpp

	crypto/gui/newresultpage.cpp
	crypto/gui/signencryptfileswizard.cpp

	crypto/gui/signencryptemailconflictdialog.cpp

	crypto/gui/decryptverifyoperationwidget.cpp
	crypto/gui/decryptverifyfileswizard.cpp
	crypto/gui/decryptverifyfilesdialog.cpp

	crypto/gui/objectspage.cpp
	crypto/gui/resolverecipientspage.cpp
	crypto/gui/signerresolvepage.cpp
	crypto/gui/encryptemailwizard.cpp
	crypto/gui/signemailwizard.cpp
	crypto/gui/signencryptwidget.cpp
	crypto/gui/signencryptwizard.cpp
	crypto/gui/unknownrecipientwidget.cpp

	crypto/gui/verifychecksumsdialog.cpp

	commands/command.cpp
	commands/gnupgprocesscommand.cpp
	commands/detailscommand.cpp
	commands/exportcertificatecommand.cpp
	commands/importcertificatescommand.cpp
	commands/importcertificatefromfilecommand.cpp
	commands/importcertificatefromclipboardcommand.cpp
	commands/importcertificatefromdatacommand.cpp
	commands/lookupcertificatescommand.cpp
	commands/reloadkeyscommand.cpp
	commands/refreshx509certscommand.cpp
	commands/refreshopenpgpcertscommand.cpp
	commands/deletecertificatescommand.cpp
	commands/decryptverifyfilescommand.cpp
	commands/signencryptfilescommand.cpp
	commands/signencryptfoldercommand.cpp
	commands/encryptclipboardcommand.cpp
	commands/signclipboardcommand.cpp
	commands/decryptverifyclipboardcommand.cpp
	commands/clearcrlcachecommand.cpp
	commands/dumpcrlcachecommand.cpp
	commands/dumpcertificatecommand.cpp
	commands/importcrlcommand.cpp
	commands/changeexpirycommand.cpp
	commands/changeownertrustcommand.cpp
	commands/changeroottrustcommand.cpp
	commands/changepassphrasecommand.cpp
	commands/certifycertificatecommand.cpp
	commands/revokecertificationcommand.cpp
	commands/selftestcommand.cpp
	commands/exportsecretkeycommand.cpp
	commands/exportopenpgpcertstoservercommand.cpp
	commands/adduseridcommand.cpp
	commands/newcertificatecommand.cpp
	commands/setinitialpincommand.cpp
	commands/learncardkeyscommand.cpp
	commands/checksumcreatefilescommand.cpp
	commands/checksumverifyfilescommand.cpp
	commands/exportpaperkeycommand.cpp
	commands/importpaperkeycommand.cpp
	commands/genrevokecommand.cpp
	commands/keytocardcommand.cpp
	commands/cardcommand.cpp
	commands/pivgeneratecardkeycommand.cpp
	commands/changepincommand.cpp
	commands/authenticatepivcardapplicationcommand.cpp
	commands/setpivcardapplicationadministrationkeycommand.cpp
	commands/certificatetopivcardcommand.cpp
	commands/importcertificatefrompivcardcommand.cpp
	commands/createopenpgpkeyfromcardkeyscommand.cpp
	commands/createcsrforcardkeycommand.cpp

	${_kleopatra_uiserver_files}

	conf/configuredialog.cpp

	newcertificatewizard/listwidget.cpp
	newcertificatewizard/newcertificatewizard.cpp

	smartcard/readerstatus.cpp
	smartcard/card.cpp
	smartcard/openpgpcard.cpp
	smartcard/netkeycard.cpp
	smartcard/pivcard.cpp
	smartcard/keypairinfo.cpp
	smartcard/utils.cpp

	${_kleopatra_deviceinfowatcher_files}

	aboutdata.cpp
	systrayicon.cpp
	kleopatraapplication.cpp
	mainwindow.cpp
	main.cpp
	)

	if(WIN32)
	configure_file (versioninfo.rc.in versioninfo.rc)
	set(_kleopatra_SRCS ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc ${_kleopatra_SRCS})
	endif()

	if(HAVE_KCMUTILS)
	set (_kleopatra_extra_libs KF5::KCMUtils)
	else()
	set (_kleopatra_SRCS conf/kleopageconfigdialog.cpp ${_kleopatra_SRCS})
	endif()

	ecm_qt_declare_logging_category(_kleopatra_SRCS HEADER kleopatra_debug.h IDENTIFIER KLEOPATRA_LOG CATEGORY_NAME org.kde.pim.kleopatra
	DESCRIPTION "kleopatra (kleopatra)"
	OLD_CATEGORY_NAMES log_kleopatra
	EXPORT KLEOPATRA
	)


	if(KLEO_MODEL_TEST)
	add_definitions(-DKLEO_MODEL_TEST)
	set(_kleopatra_SRCS ${_kleopatra_SRCS} models/modeltest.cpp)
	endif()

	ki18n_wrap_ui(_kleopatra_SRCS
	dialogs/expirydialog.ui
	dialogs/lookupcertificatesdialog.ui
	dialogs/ownertrustdialog.ui
	dialogs/selectchecklevelwidget.ui
	dialogs/selftestdialog.ui
	dialogs/adduseriddialog.ui
	dialogs/setinitialpindialog.ui
	dialogs/certificatedetailswidget.ui
	dialogs/trustchainwidget.ui
	dialogs/subkeyswidget.ui
	newcertificatewizard/listwidget.ui
	newcertificatewizard/chooseprotocolpage.ui
	newcertificatewizard/enterdetailspage.ui
	newcertificatewizard/overviewpage.ui
	newcertificatewizard/keycreationpage.ui
	newcertificatewizard/resultpage.ui
	newcertificatewizard/advancedsettingsdialog.ui
	)

	kconfig_add_kcfg_files(_kleopatra_SRCS
	kcfg/tooltippreferences.kcfgc
	kcfg/emailoperationspreferences.kcfgc
	kcfg/fileoperationspreferences.kcfgc
	kcfg/smimevalidationpreferences.kcfgc
	)

	file(GLOB ICONS_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/icons/*-apps-kleopatra.png")
	ecm_add_app_icon(_kleopatra_SRCS ICONS ${ICONS_SRCS})

	qt5_add_resources(_kleopatra_SRCS kleopatra.qrc)

	add_executable(kleopatra_bin ${_kleopatra_SRCS} ${_kleopatra_uiserver_SRCS})
	-if (COMPILE_WITH_CMAKE_SUPPORT)
	+if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	set_target_properties(kleopatra_bin PROPERTIES UNITY_BUILD ON)
	endif()
	set_target_properties(kleopatra_bin PROPERTIES OUTPUT_NAME kleopatra)

	target_link_libraries(kleopatra_bin
	Gpgmepp
	QGpgme
	${_kleopatra_extra_libs}
	KF5::Libkleo
	KF5::Mime
	KF5::I18n
	KF5::XmlGui
	KF5::IconThemes
	KF5::WindowSystem
	KF5::CoreAddons
	KF5::ItemModels
	KF5::Crash
	Qt5::Network
	Qt5::PrintSupport # Printing secret keys
	${_kleopatra_uiserver_extra_libs}
	${_kleopatra_dbusaddons_libs}
	kleopatraclientcore
	)

	install(TARGETS kleopatra_bin ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

	install(
	PROGRAMS data/org.kde.kleopatra.desktop data/kleopatra_import.desktop
	DESTINATION ${KDE_INSTALL_APPDIR}
	)
	install(FILES data/org.kde.kleopatra.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR})
	install(
	FILES data/kleopatra_signencryptfiles.desktop
	data/kleopatra_signencryptfolders.desktop
	data/kleopatra_decryptverifyfiles.desktop
	data/kleopatra_decryptverifyfolders.desktop
	DESTINATION ${KDE_INSTALL_KSERVICES5DIR}
	)
	diff --git a/src/kwatchgnupg/CMakeLists.txt b/src/kwatchgnupg/CMakeLists.txt
	index 31c336329..4173f3d5c 100644
	--- a/src/kwatchgnupg/CMakeLists.txt
	+++ b/src/kwatchgnupg/CMakeLists.txt
	@@ -1,49 +1,49 @@
	set(kwatchgnupg_version 1.0)

	find_package(KF5Notifications ${KF5_MIN_VERSION} CONFIG REQUIRED)
	find_package(KF5TextWidgets ${KF5_MIN_VERSION} CONFIG REQUIRED)

	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version-kwatchgnupg.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version-kwatchgnupg.h)

	set(kwatchgnupg_SRCS
	../utils/hex.cpp
	../utils/kuniqueservice.cpp
	../kleopatra_debug.cpp
	kwatchgnupgmainwin.cpp
	kwatchgnupgconfig.cpp
	aboutdata.cpp
	tray.cpp
	main.cpp
	)

	ecm_qt_declare_logging_category(kwatchgnupg_SRCS HEADER kwatchgnupg_debug.h IDENTIFIER KWATCHGNUPG_LOG CATEGORY_NAME org.kde.pim.kwatchgnupg
	DESCRIPTION "kwatchgnupg (kwatchgnupg)"
	OLD_CATEGORY_NAMES log_kwatchgnupg
	EXPORT KLEOPATRA
	)

	qt5_add_resources(kwatchgnupg_SRCS kwatchgnupg.qrc)

	if(WIN32)
	set(kwatchgnupg_SRCS ${kwatchgnupg_SRCS} ../utils/gnupg-registry.c)
	endif()

	add_executable(kwatchgnupg ${kwatchgnupg_SRCS})
	-if (COMPILE_WITH_CMAKE_SUPPORT)
	+if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	set_target_properties(kwatchgnupg PROPERTIES UNITY_BUILD ON)
	endif()


	target_link_libraries(kwatchgnupg
	KF5::DBusAddons
	KF5::XmlGui
	KF5::Notifications
	KF5::TextWidgets
	KF5::IconThemes
	KF5::Libkleo
	KF5::Crash
	)

	install(TARGETS kwatchgnupg ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

	install(FILES images/kwatchgnupg.png images/kwatchgnupg2.png DESTINATION ${KDE_INSTALL_DATADIR}/kwatchgnupg/pics)
	diff --git a/src/libkleopatraclient/core/CMakeLists.txt b/src/libkleopatraclient/core/CMakeLists.txt
	index 490e3e155..fb6aa7f26 100644
	--- a/src/libkleopatraclient/core/CMakeLists.txt
	+++ b/src/libkleopatraclient/core/CMakeLists.txt
	@@ -1,69 +1,69 @@
	add_definitions(
	-D_ASSUAN_ONLY_GPG_ERRORS
	)

	if(WIN32)
	set(_kleopatraclientcore_extra_SRCS ../../utils/gnupg-registry.c)
	else()
	set(_kleopatraclientcore_extra_SRCS)
	endif()

	ecm_qt_declare_logging_category(_kleopatraclientcore_common_SRCS HEADER libkleopatraclientcore_debug.h IDENTIFIER LIBKLEOPATRACLIENTCORE_LOG CATEGORY_NAME org.kde.pim.libkleopatraclientcore
	DESCRIPTION "kleopatra (kleopatra)"
	OLD_CATEGORY_NAMES log_libkleopatraclientcore
	EXPORT KLEOPATRA
	)


	add_library(kleopatraclientcore
	${_kleopatraclientcore_extra_SRCS}
	initialization.cpp
	command.cpp
	selectcertificatecommand.cpp
	signencryptfilescommand.cpp
	decryptverifyfilescommand.cpp
	libkleopatraclientcore_debug.cpp
	${_kleopatraclientcore_common_SRCS}
	)
	generate_export_header(kleopatraclientcore BASE_NAME kleopatraclientcore)

	set_target_properties(kleopatraclientcore PROPERTIES
	VERSION ${libkleopatraclient_version}
	SOVERSION ${libkleopatraclient_soversion}
	)
	-if (COMPILE_WITH_CMAKE_SUPPORT)
	+if (COMPILE_WITH_UNITY_CMAKE_SUPPORT)
	set_target_properties(kleopatraclientcore PROPERTIES UNITY_BUILD ON)
	endif()


	if(WIN32)
	if(ASSUAN2_FOUND)
	target_link_libraries(kleopatraclientcore

	${ASSUAN2_LIBRARIES}
	ws2_32
	)
	else()
	target_link_libraries(kleopatraclientcore

	${ASSUAN_VANILLA_LIBRARIES}
	ws2_32
	)
	endif()
	else()
	if(ASSUAN2_FOUND)
	target_link_libraries(kleopatraclientcore

	${ASSUAN2_LIBRARIES}
	)
	else()
	target_link_libraries(kleopatraclientcore

	${ASSUAN_PTHREAD_LIBRARIES}
	)
	endif()
	endif()

	target_link_libraries(kleopatraclientcore Qt5::Widgets KF5::I18n Gpgmepp)

	install(TARGETS kleopatraclientcore ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})

File Metadata

Mime Type: text/x-diff
Expires: Thu, Jul 17, 12:21 AM (12 h, 59 m)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: d4/35/93209cd9fa915c3afbabe4dba4c1

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions