Commit 6689b2ba authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Clean up

parent baac5cc7
ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKDEPIM
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfigVersion.cmake"
SOVERSION 5
)
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfigVersion.cmake"
SOVERSION 5
)
add_subdirectory(pics)
if (BUILD_TESTING)
add_subdirectory(tests)
add_subdirectory(tests)
endif()
########### next target ###############
set(kdepim_progresswidget_LIB_SRCS
progresswidget/progressmanager.cpp
progresswidget/progressdialog.cpp
progresswidget/statusbarprogresswidget.cpp
progresswidget/ssllabel.cpp
progresswidget/progressstatusbarwidget.cpp
)
progresswidget/progressmanager.cpp
progresswidget/progressdialog.cpp
progresswidget/statusbarprogresswidget.cpp
progresswidget/ssllabel.cpp
progresswidget/progressstatusbarwidget.cpp
)
set(kdepim_widgets_LIB_SRCS
widgets/customlogwidget.cpp
widgets/kdatepickerpopup.cpp
widgets/kcheckcombobox.cpp
widgets/kweekdaycheckcombo.cpp
widgets/kwidgetlister.cpp
widgets/pimmessagebox.cpp
widgets/overlaywidget.cpp
widgets/progressindicatorlabel.cpp
widgets/progressindicatorwidget.cpp
)
widgets/customlogwidget.cpp
widgets/kdatepickerpopup.cpp
widgets/kcheckcombobox.cpp
widgets/kweekdaycheckcombo.cpp
widgets/kwidgetlister.cpp
widgets/pimmessagebox.cpp
widgets/overlaywidget.cpp
widgets/progressindicatorlabel.cpp
widgets/progressindicatorwidget.cpp
)
set(kdepim_ldap_LIB_SRCS
ldap/addhostdialog.cpp
ldap/ldapclient.cpp
ldap/ldapsearchdialog.cpp
ldap/ldapclientsearch.cpp
ldap/ldapclientsearchconfig.cpp
ldap/addhostdialog.cpp
)
ldap/addhostdialog.cpp
ldap/ldapclient.cpp
ldap/ldapsearchdialog.cpp
ldap/ldapclientsearch.cpp
ldap/ldapclientsearchconfig.cpp
ldap/addhostdialog.cpp
)
ecm_qt_declare_logging_category(kdepim_ldap_LIB_SRCS HEADER ldapclient_debug.h IDENTIFIER LDAPCLIENT_LOG CATEGORY_NAME org.kde.pim.ldapclient)
set(kdepim_misc_LIB_SRCS
misc/broadcaststatus.cpp
misc/emailvalidator.cpp
misc/maillistdrag.cpp
misc/uistatesaver.cpp
)
misc/broadcaststatus.cpp
misc/emailvalidator.cpp
misc/maillistdrag.cpp
misc/uistatesaver.cpp
)
set(kdepim_multiplyingline_LIB_SRCS
multiplyingline/multiplyingline.cpp
multiplyingline/multiplyinglineeditor.cpp
multiplyingline/multiplyinglineview_p.cpp
)
multiplyingline/multiplyingline.cpp
multiplyingline/multiplyinglineeditor.cpp
multiplyingline/multiplyinglineview_p.cpp
)
set(kdepim_LIB_SRCS
${kdepim_progresswidget_LIB_SRCS}
${kdepim_widgets_LIB_SRCS}
${kdepim_ldap_LIB_SRCS}
${kdepim_misc_LIB_SRCS}
${kdepim_multiplyingline_LIB_SRCS}
prefs/kprefsdialog.cpp
)
${kdepim_progresswidget_LIB_SRCS}
${kdepim_widgets_LIB_SRCS}
${kdepim_ldap_LIB_SRCS}
${kdepim_misc_LIB_SRCS}
${kdepim_multiplyingline_LIB_SRCS}
prefs/kprefsdialog.cpp
)
ecm_qt_declare_logging_category(kdepim_LIB_SRCS HEADER libkdepim_debug.h IDENTIFIER LIBKDEPIM_LOG CATEGORY_NAME org.kde.pim.libkdepim)
......@@ -73,25 +72,23 @@ add_library(KF5::Libkdepim ALIAS KF5Libkdepim)
target_include_directories(KF5Libkdepim INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/Libkdepim/;${KDE_INSTALL_INCLUDEDIR_KF5}/libkdepim>")
target_include_directories(KF5Libkdepim PUBLIC "$<BUILD_INTERFACE:${libkdepim_SOURCE_DIR}/src;${libkdepim_BINARY_DIR}/src;>")
target_link_libraries(KF5Libkdepim
PRIVATE
KF5::Ldap
KF5::Contacts
KF5::Codecs
KF5::Completion
KF5::I18n
KF5::KCMUtils
KF5::Wallet
KF5::IconThemes
KF5::KIOCore
KF5::KIOWidgets
)
PRIVATE
KF5::Ldap
KF5::Contacts
KF5::Codecs
KF5::Completion
KF5::I18n
KF5::KCMUtils
KF5::Wallet
KF5::IconThemes
KF5::KIOCore
KF5::KIOWidgets
)
if(MINGW)
target_link_libraries(KF5Libkdepim oleaut32)
target_link_libraries(KF5Libkdepim oleaut32)
endif()
......@@ -99,86 +96,86 @@ set_target_properties(KF5Libkdepim PROPERTIES
VERSION ${LIBKDEPIM_VERSION_STRING}
SOVERSION ${LIBKDEPIM_SOVERSION}
EXPORT_NAME Libkdepim
)
)
install(TARGETS
KF5Libkdepim
EXPORT KF5LibkdepimTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ${LIBRARY_NAMELINK}
)
)
ecm_generate_headers(libkdepim_Camelcaseldap_HEADERS
HEADER_NAMES
LdapClientSearchConfig
LdapClientSearch
AddHostDialog
LdapSearchDialog
LdapClient
REQUIRED_HEADERS libkdepim_ldap_HEADERS
PREFIX Libkdepim
RELATIVE ldap
)
HEADER_NAMES
LdapClientSearchConfig
LdapClientSearch
AddHostDialog
LdapSearchDialog
LdapClient
REQUIRED_HEADERS libkdepim_ldap_HEADERS
PREFIX Libkdepim
RELATIVE ldap
)
ecm_generate_headers(libkdepim_Camelcasewidgets_HEADERS
HEADER_NAMES
CustomLogWidget
KCheckComboBox
KDatePickerPopup
KWeekdayCheckCombo
KWidgetLister
OverlayWidget
PIMMessageBox
ProgressIndicatorLabel
ProgressIndicatorWidget
REQUIRED_HEADERS libkdepim_widgets_HEADERS
PREFIX Libkdepim
RELATIVE widgets
)
HEADER_NAMES
CustomLogWidget
KCheckComboBox
KDatePickerPopup
KWeekdayCheckCombo
KWidgetLister
OverlayWidget
PIMMessageBox
ProgressIndicatorLabel
ProgressIndicatorWidget
REQUIRED_HEADERS libkdepim_widgets_HEADERS
PREFIX Libkdepim
RELATIVE widgets
)
ecm_generate_headers(libkdepim_Camelcasemisc_HEADERS
HEADER_NAMES
EmailValidator
BroadcastStatus
MaillistDrag
UiStateSaver
KCursorSaver
REQUIRED_HEADERS libkdepim_misc_HEADERS
PREFIX Libkdepim
RELATIVE misc
)
HEADER_NAMES
EmailValidator
BroadcastStatus
MaillistDrag
UiStateSaver
KCursorSaver
REQUIRED_HEADERS libkdepim_misc_HEADERS
PREFIX Libkdepim
RELATIVE misc
)
ecm_generate_headers(libkdepim_Camelcaseprogresswidget_HEADERS
HEADER_NAMES
ProgressStatusBarWidget
StatusbarProgressWidget
ProgressDialog
ProgressManager
REQUIRED_HEADERS libkdepim_progresswidget_HEADERS
PREFIX Libkdepim
RELATIVE progresswidget
)
HEADER_NAMES
ProgressStatusBarWidget
StatusbarProgressWidget
ProgressDialog
ProgressManager
REQUIRED_HEADERS libkdepim_progresswidget_HEADERS
PREFIX Libkdepim
RELATIVE progresswidget
)
ecm_generate_headers(libkdepim_Camelcasepref_HEADERS
HEADER_NAMES
KPrefsDialog
REQUIRED_HEADERS libkdepim_pref_HEADERS
PREFIX Libkdepim
RELATIVE prefs
)
HEADER_NAMES
KPrefsDialog
REQUIRED_HEADERS libkdepim_pref_HEADERS
PREFIX Libkdepim
RELATIVE prefs
)
ecm_generate_headers(libkdepim_Camelcasemultiline_HEADERS
HEADER_NAMES
MultiplyingLine
MultiplyingLineEditor
REQUIRED_HEADERS libkdepim_multiline_HEADERS
PREFIX Libkdepim
RELATIVE multiplyingline
)
HEADER_NAMES
MultiplyingLine
MultiplyingLineEditor
REQUIRED_HEADERS libkdepim_multiline_HEADERS
PREFIX Libkdepim
RELATIVE multiplyingline
)
ecm_generate_pri_file(BASE_NAME Libkdepim
LIB_NAME KF5Libkdepim
DEPS "" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Libkdepim
)
)
install(FILES
${libkdepim_Camelcaseblacklistbaloocompletion_HEADERS}
......@@ -193,7 +190,7 @@ install(FILES
${libkdepim_Camelcasemultiline_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/Libkdepim
COMPONENT Devel
)
)
install(FILES
${libkdepim_blacklistbaloocompletion_HEADERS}
......@@ -209,7 +206,7 @@ install(FILES
${libkdepim_multiline_HEADERS}
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/libkdepim
COMPONENT Devel
)
)
install(FILES
${PRI_FILENAME}
......@@ -220,13 +217,13 @@ add_subdirectory(designer)
set( kcm_ldap_SRCS
ldap/kcmldap.cpp
)
ldap/kcmldap.cpp
)
add_library(kcm_ldap MODULE ${kcm_ldap_SRCS})
target_link_libraries(kcm_ldap KF5::Libkdepim KF5::IconThemes KF5::KCMUtils KF5::I18n KF5::Ldap Qt5::Core)
target_link_libraries(kcm_ldap KF5::Libkdepim KF5::IconThemes KF5::KCMUtils KF5::I18n KF5::Ldap Qt5::Core)
kcoreaddons_desktop_to_json(kcm_ldap ldap/kcmldap.desktop DEFAULT_SERVICE_TYPE)
......@@ -241,21 +238,21 @@ install(FILES interfaces/org.kde.addressbook.service.xml interfaces/org.kde.mail
set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Libkdepim")
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5LibkdepimConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
"${CMAKE_CURRENT_SOURCE_DIR}/KF5LibkdepimConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
install(EXPORT KF5LibkdepimTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5LibkdepimTargets.cmake NAMESPACE KF5::)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
)
${CMAKE_CURRENT_BINARY_DIR}/libkdepim_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
)
ecm_setup_version(PROJECT VARIABLE_PREFIX LIBKDEPIM
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepimakonadi_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfigVersion.cmake"
SOVERSION 5
)
VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/libkdepimakonadi_version.h"
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfigVersion.cmake"
SOVERSION 5
)
if(BUILD_TESTING)
add_subdirectory(tests)
......@@ -101,12 +101,10 @@ target_link_libraries(KF5LibkdepimAkonadi
KF5::ConfigWidgets
)
if(MINGW)
target_link_libraries(KF5LibkdepimAkonadi oleaut32)
endif()
set_target_properties(KF5LibkdepimAkonadi PROPERTIES
VERSION ${LIBKDEPIM_VERSION_STRING}
SOVERSION ${LIBKDEPIM_SOVERSION}
......@@ -192,7 +190,7 @@ ecm_generate_headers(libkdepim_Camelcaseblacklistbaloocompletion_HEADERS
ecm_generate_pri_file(BASE_NAME LibkdepimAkonadi
LIB_NAME KF5LibkdepimAkonadi
DEPS "AkonadiCore AkonadiContact" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/Libkdepim
DEPS "AkonadiCore AkonadiContact Libkdepim" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/LibkdepimAkonadi
)
install(FILES
......@@ -232,20 +230,20 @@ set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5LibkdepimAkonadi"
install(EXPORT KF5LibkdepimAkonadiTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5LibkdepimAkonadiTargets.cmake NAMESPACE KF5::)
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/KF5LibkdepimAkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
"${CMAKE_CURRENT_SOURCE_DIR}/KF5LibkdepimAkonadiConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfig.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/KF5LibkdepimAkonadiConfigVersion.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel
)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/libkdepimakonadi_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
)
${CMAKE_CURRENT_BINARY_DIR}/libkdepimakonadi_version.h
DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment