Git commit 2f5c5a539f0d9bcb3a67f26d6ce121e05e40ecb0 by Laurent Montel. Committed on 08/06/2025 at 16:00. Pushed by mlaurent into branch 'master'.
Fix spell checking + cmake lint + clang-format M +71 -28 cmake/FindLdap.cmake M +1 -2 kioworker/CMakeLists.txt M +0 -1 kioworker/doc/ldap/CMakeLists.txt M +1 -1 kioworker/doc/ldap/index.docbook M +8 -3 kioworker/src/CMakeLists.txt M +0 -1 readme-build-ftime.txt M +96 -80 src/core/CMakeLists.txt M +16 -5 src/core/autotests/CMakeLists.txt M +1 -1 src/core/autotests/testkldap.cpp M +1 -1 src/core/ldapsearch.cpp M +68 -51 src/widgets/CMakeLists.txt https://invent.kde.org/pim/kldap/-/commit/2f5c5a539f0d9bcb3a67f26d6ce121e05e40ecb0 diff --git a/cmake/FindLdap.cmake b/cmake/FindLdap.cmake index 74392794..bca95ced 100644 --- a/cmake/FindLdap.cmake +++ b/cmake/FindLdap.cmake @@ -41,59 +41,102 @@ find_path(Ldap_INCLUDE_DIRS NAMES ldap.h) if(APPLE) - find_library(Ldap_LIBRARIES NAMES LDAP - PATHS - /System/Library/Frameworks - /Library/Frameworks - ) + find_library( + Ldap_LIBRARIES + NAMES LDAP + PATHS /System/Library/Frameworks /Library/Frameworks + ) else() - find_library(Ldap_LIBRARY NAMES ldap) - find_library(Lber_LIBRARY NAMES lber) + find_library(Ldap_LIBRARY NAMES ldap) + find_library(Lber_LIBRARY NAMES lber) endif() if(Ldap_LIBRARY AND Lber_LIBRARY) - set(Ldap_LIBRARIES ${Ldap_LIBRARY} ${Lber_LIBRARY}) + set(Ldap_LIBRARIES ${Ldap_LIBRARY} ${Lber_LIBRARY}) endif() if(EXISTS ${Ldap_INCLUDE_DIRS}/ldap_features.h) - file(READ ${Ldap_INCLUDE_DIRS}/ldap_features.h LDAP_FEATURES_H_CONTENT) - string(REGEX MATCH "#define LDAP_VENDOR_VERSION_MAJOR[ ]+[0-9]+" _LDAP_VERSION_MAJOR_MATCH ${LDAP_FEATURES_H_CONTENT}) - string(REGEX MATCH "#define LDAP_VENDOR_VERSION_MINOR[ ]+[0-9]+" _LDAP_VERSION_MINOR_MATCH ${LDAP_FEATURES_H_CONTENT}) - string(REGEX MATCH "#define LDAP_VENDOR_VERSION_PATCH[ ]+[0-9]+" _LDAP_VERSION_PATCH_MATCH ${LDAP_FEATURES_H_CONTENT}) + file(READ ${Ldap_INCLUDE_DIRS}/ldap_features.h LDAP_FEATURES_H_CONTENT) + string( + REGEX MATCH + "#define LDAP_VENDOR_VERSION_MAJOR[ ]+[0-9]+" + _LDAP_VERSION_MAJOR_MATCH + ${LDAP_FEATURES_H_CONTENT} + ) + string( + REGEX MATCH + "#define LDAP_VENDOR_VERSION_MINOR[ ]+[0-9]+" + _LDAP_VERSION_MINOR_MATCH + ${LDAP_FEATURES_H_CONTENT} + ) + string( + REGEX MATCH + "#define LDAP_VENDOR_VERSION_PATCH[ ]+[0-9]+" + _LDAP_VERSION_PATCH_MATCH + ${LDAP_FEATURES_H_CONTENT} + ) - string(REGEX REPLACE ".*_MAJOR[ ]+(.*)" "\\1" LDAP_VERSION_MAJOR ${_LDAP_VERSION_MAJOR_MATCH}) - string(REGEX REPLACE ".*_MINOR[ ]+(.*)" "\\1" LDAP_VERSION_MINOR ${_LDAP_VERSION_MINOR_MATCH}) - string(REGEX REPLACE ".*_PATCH[ ]+(.*)" "\\1" LDAP_VERSION_PATCH ${_LDAP_VERSION_PATCH_MATCH}) + string( + REGEX REPLACE + ".*_MAJOR[ ]+(.*)" + "\\1" + LDAP_VERSION_MAJOR + ${_LDAP_VERSION_MAJOR_MATCH} + ) + string( + REGEX REPLACE + ".*_MINOR[ ]+(.*)" + "\\1" + LDAP_VERSION_MINOR + ${_LDAP_VERSION_MINOR_MATCH} + ) + string( + REGEX REPLACE + ".*_PATCH[ ]+(.*)" + "\\1" + LDAP_VERSION_PATCH + ${_LDAP_VERSION_PATCH_MATCH} + ) - set(Ldap_VERSION "${LDAP_VERSION_MAJOR}.${LDAP_VERSION_MINOR}.${LDAP_VERSION_PATCH}") + set(Ldap_VERSION + "${LDAP_VERSION_MAJOR}.${LDAP_VERSION_MINOR}.${LDAP_VERSION_PATCH}" + ) endif() include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(Ldap +find_package_handle_standard_args( + Ldap FOUND_VAR Ldap_FOUND REQUIRED_VARS Ldap_LIBRARIES Ldap_INCLUDE_DIRS VERSION_VAR Ldap_VERSION ) if(Ldap_FOUND AND NOT TARGET Lber::Lber) - add_library(Lber::Lber UNKNOWN IMPORTED) - set_target_properties(Lber::Lber PROPERTIES - IMPORTED_LOCATION "${Lber_LIBRARY}") + add_library(Lber::Lber UNKNOWN IMPORTED) + set_target_properties( + Lber::Lber + PROPERTIES IMPORTED_LOCATION "${Lber_LIBRARY}" + ) endif() if(Ldap_FOUND AND NOT TARGET Ldap::Ldap) - add_library(Ldap::Ldap UNKNOWN IMPORTED) - set_target_properties(Ldap::Ldap PROPERTIES - IMPORTED_LOCATION "${Ldap_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${Ldap_INCLUDE_DIRS}" - INTERFACE_LINK_LIBRARIES Lber::Lber) + add_library(Ldap::Ldap UNKNOWN IMPORTED) + set_target_properties( + Ldap::Ldap + PROPERTIES + IMPORTED_LOCATION "${Ldap_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${Ldap_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES Lber::Lber + ) endif() mark_as_advanced(Ldap_INCLUDE_DIRS Ldap_LIBRARY Lber_LIBRARY Ldap_LIBRARIES) include(FeatureSummary) -set_package_properties(Ldap PROPERTIES - URL "https://www.openldap.org/"; - DESCRIPTION "LDAP (Lightweight Directory Access Protocol) libraries." +set_package_properties( + Ldap + PROPERTIES + URL "https://www.openldap.org/"; + DESCRIPTION "LDAP (Lightweight Directory Access Protocol) libraries." ) diff --git a/kioworker/CMakeLists.txt b/kioworker/CMakeLists.txt index e8e37622..6ed9e408 100644 --- a/kioworker/CMakeLists.txt +++ b/kioworker/CMakeLists.txt @@ -3,6 +3,5 @@ add_subdirectory(src) if(KF6DocTools_FOUND) - add_subdirectory(doc) + add_subdirectory(doc) endif() - diff --git a/kioworker/doc/ldap/CMakeLists.txt b/kioworker/doc/ldap/CMakeLists.txt index a866f6cf..d0069cbb 100644 --- a/kioworker/doc/ldap/CMakeLists.txt +++ b/kioworker/doc/ldap/CMakeLists.txt @@ -2,4 +2,3 @@ # SPDX-License-Identifier: BSD-3-Clause ########### install files ############### kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${KDE_INSTALL_DOCBUNDLEDIR}/en SUBDIR kioworker6/ldap) - diff --git a/kioworker/doc/ldap/index.docbook b/kioworker/doc/ldap/index.docbook index bd534aff..5ace3484 100644 --- a/kioworker/doc/ldap/index.docbook +++ b/kioworker/doc/ldap/index.docbook @@ -4,7 +4,7 @@ <!ENTITY % addindex "IGNORE"> <!ENTITY % English "INCLUDE" > <!-- change language only here --> ]> - + <article lang="&language;" id="ldap"> <title>ldap</title> <articleinfo> diff --git a/kioworker/src/CMakeLists.txt b/kioworker/src/CMakeLists.txt index d8faf4e4..9f769905 100644 --- a/kioworker/src/CMakeLists.txt +++ b/kioworker/src/CMakeLists.txt @@ -11,10 +11,15 @@ ecm_qt_declare_logging_category(kio_ldap EXPORT KLDAP ) - -target_link_libraries(kio_ldap Qt::Network KF6::KIOCore KF6::I18n KPim6::LdapCore) +target_link_libraries( + kio_ldap + Qt::Network + KF6::KIOCore + KF6::I18n + KPim6::LdapCore +) if(WIN32) target_link_libraries(kio_ldap ws2_32) endif() set_target_properties(kio_ldap PROPERTIES OUTPUT_NAME "ldap") -install(TARGETS kio_ldap DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/kio) +install(TARGETS kio_ldap DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf6/kio) diff --git a/readme-build-ftime.txt b/readme-build-ftime.txt index 833cfa00..b931a180 100644 --- a/readme-build-ftime.txt +++ b/readme-build-ftime.txt @@ -23,4 +23,3 @@ ClangBuildAnalyzer --analyze build-ftime.txt > analyze-build-ftime.txt see https://aras-p.info/blog/2019/09/28/Clang-Build-Analyzer/ - diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 2da8b3cb..07522aaa 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -10,7 +10,6 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KLDAPCORE SOVERSION 6 ) - check_include_files(sys/time.h HAVE_SYS_TIME_H) set(kldap_EXTRA_LIBS) @@ -27,7 +26,10 @@ if(Ldap_FOUND) check_function_exists(ber_memfree HAVE_BER_MEMFREE) check_function_exists(ldap_unbind_ext HAVE_LDAP_UNBIND_EXT) check_function_exists(ldap_extended_operation HAVE_LDAP_EXTENDED_OPERATION) - check_function_exists(ldap_extended_operation_s HAVE_LDAP_EXTENDED_OPERATION_S) + check_function_exists( + ldap_extended_operation_s + HAVE_LDAP_EXTENDED_OPERATION_S + ) endif() set(kldap_EXTRA_LIBS ${kldap_EXTRA_LIBS} Sasl2::Sasl2) @@ -39,51 +41,49 @@ configure_file(kldap_config.h.in ${CMAKE_CURRENT_BINARY_DIR}/kldap_config.h) add_library(KPim6LdapCore) add_library(KPim6::LdapCore ALIAS KPim6LdapCore) -target_sources(KPim6LdapCore PRIVATE - ber.cpp - ldif.cpp - ldapurl.cpp - ldapserver.cpp - ldapobject.cpp - ldapconnection.cpp - ldapoperation.cpp - ldapcontrol.cpp - ldapsearch.cpp - ldapdn.cpp - ldif.h - ldapsearch.h - w32-ldap-help.h - ldapurl.h - ldapcontrol.h - ber.h - ldapdefs.h - ldapconnection.h - ldapdn.h - ldapoperation.h - ldapserver.h - ldapobject.h - - ldapmodel.h - ldapmodel.cpp - ldapsortproxymodel.cpp - ldapsortproxymodel.h - - ldapactivitiesabstract.h - ldapactivitiesabstract.cpp - - ldapclientsearchconfigreadconfigjob.cpp - ldapclientsearchconfigreadconfigjob.h - ldapclientsearchconfigwriteconfigjob.cpp - ldapclientsearchconfigwriteconfigjob.h - ldapsearchclientreadconfigserverjob.cpp - ldapsearchclientreadconfigserverjob.h - - ldapclient.cpp - ldapclient.h - ldapclientsearchconfig.cpp - ldapclientsearchconfig.h - ldapclientsearch.cpp - ldapclientsearch.h +target_sources( + KPim6LdapCore + PRIVATE + ber.cpp + ldif.cpp + ldapurl.cpp + ldapserver.cpp + ldapobject.cpp + ldapconnection.cpp + ldapoperation.cpp + ldapcontrol.cpp + ldapsearch.cpp + ldapdn.cpp + ldif.h + ldapsearch.h + w32-ldap-help.h + ldapurl.h + ldapcontrol.h + ber.h + ldapdefs.h + ldapconnection.h + ldapdn.h + ldapoperation.h + ldapserver.h + ldapobject.h + ldapmodel.h + ldapmodel.cpp + ldapsortproxymodel.cpp + ldapsortproxymodel.h + ldapactivitiesabstract.h + ldapactivitiesabstract.cpp + ldapclientsearchconfigreadconfigjob.cpp + ldapclientsearchconfigreadconfigjob.h + ldapclientsearchconfigwriteconfigjob.cpp + ldapclientsearchconfigwriteconfigjob.h + ldapsearchclientreadconfigserverjob.cpp + ldapsearchclientreadconfigserverjob.h + ldapclient.cpp + ldapclient.h + ldapclientsearchconfig.cpp + ldapclientsearchconfig.h + ldapclientsearch.cpp + ldapclientsearch.h ) ecm_qt_declare_logging_category(KPim6LdapCore HEADER ldap_core_debug.h IDENTIFIER LDAP_CORE_LOG CATEGORY_NAME org.kde.pim.ldap.core @@ -102,29 +102,41 @@ if(COMPILE_WITH_UNITY_CMAKE_SUPPORT) endif() generate_export_header(KPim6LdapCore BASE_NAME kldap_core) - - -target_link_libraries(KPim6LdapCore +target_link_libraries( + KPim6LdapCore PRIVATE - KF6::I18n - KF6::ConfigCore - KF6::CoreAddons - KF6::KIOCore - ${kldap_EXTRA_LIBS} + KF6::I18n + KF6::ConfigCore + KF6::CoreAddons + KF6::KIOCore + ${kldap_EXTRA_LIBS} ) target_link_libraries(KPim6LdapCore PRIVATE qt6keychain) -target_include_directories(KPim6LdapCore INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPCore>") -target_include_directories(KPim6LdapCore PUBLIC "$<BUILD_INTERFACE:${KLdap_SOURCE_DIR}/src/core;${KLdap_BINARY_DIR}/src>") +target_include_directories( + KPim6LdapCore + INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPCore>" +) +target_include_directories( + KPim6LdapCore + PUBLIC + "$<BUILD_INTERFACE:${KLdap_SOURCE_DIR}/src/core;${KLdap_BINARY_DIR}/src>" +) -set_target_properties(KPim6LdapCore PROPERTIES - VERSION ${KLDAPCORE_VERSION} - SOVERSION ${KLDAPCORE_SOVERSION} - EXPORT_NAME LdapCore +set_target_properties( + KPim6LdapCore + PROPERTIES + VERSION ${KLDAPCORE_VERSION} + SOVERSION ${KLDAPCORE_SOVERSION} + EXPORT_NAME LdapCore ) -install(TARGETS KPim6LdapCore EXPORT KPim6LdapCoreTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS KPim6LdapCore + EXPORT KPim6LdapCoreTargets + ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} +) ########### install files ############### @@ -154,15 +166,14 @@ ecm_generate_headers(KLdapCore_CamelCase_HEADERS REQUIRED_HEADERS KLdapCore_HEADERS ) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/kldap_core_export.h - ${KLdapCore_HEADERS} +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/kldap_core_export.h ${KLdapCore_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPCore/kldapcore COMPONENT Devel ) -install(FILES - ${KLdapCore_CamelCase_HEADERS} +install( + FILES ${KLdapCore_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPCore/KLDAPCore/ COMPONENT Devel ) @@ -188,39 +199,45 @@ if(BUILD_QCH) TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel -) + ) endif() set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6LdapCore") - if(BUILD_QCH) ecm_install_qch_export( TARGETS KPim6LdapCore_QCH FILE KPim6LdapCoreQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel -) -set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6LdapCoreQchTargets.cmake\")") + ) + set(PACKAGE_INCLUDE_QCHTARGETS + "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6LdapCoreQchTargets.cmake\")" + ) endif() -install(EXPORT KPim6LdapCoreTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim6LdapCoreTargets.cmake NAMESPACE KPim6::) - +install( + EXPORT KPim6LdapCoreTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE KPim6LdapCoreTargets.cmake + NAMESPACE KPim6:: +) configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimLdapCoreConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapCoreConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapCoreConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapCoreConfigVersion.cmake" +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapCoreConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapCoreConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/kldap_core_version.h +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/kldap_core_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPCore COMPONENT Devel ) @@ -228,4 +245,3 @@ install(FILES if(BUILD_TESTING) add_subdirectory(autotests) endif() - diff --git a/src/core/autotests/CMakeLists.txt b/src/core/autotests/CMakeLists.txt index cdc8e7a4..b7ec3860 100644 --- a/src/core/autotests/CMakeLists.txt +++ b/src/core/autotests/CMakeLists.txt @@ -5,12 +5,23 @@ include(ECMAddTests) find_package(Qt6Test CONFIG REQUIRED) if(Ldap_FOUND) - ecm_add_tests(testkldap.cpp NAME_PREFIX "kldap-" LINK_LIBRARIES KPim6::LdapCore Qt::Test) + ecm_add_tests(testkldap.cpp NAME_PREFIX "kldap-" LINK_LIBRARIES KPim6::LdapCore Qt::Test) endif() #### -add_executable(ldapclientsearchconfigreadconfigjobtest ldapclientsearchconfigreadconfigjobtest.cpp ldapclientsearchconfigreadconfigjobtest.h) -add_test(NAME ldapclientsearchconfigreadconfigjobtest COMMAND ldapclientsearchconfigreadconfigjobtest) +add_executable( + ldapclientsearchconfigreadconfigjobtest + ldapclientsearchconfigreadconfigjobtest.cpp + ldapclientsearchconfigreadconfigjobtest.h +) +add_test( + NAME ldapclientsearchconfigreadconfigjobtest + COMMAND ldapclientsearchconfigreadconfigjobtest +) ecm_mark_as_test(ldapclientsearchconfigreadconfigjobtest) -target_link_libraries(ldapclientsearchconfigreadconfigjobtest Qt::Test KPim6::LdapCore KF6::ConfigCore) - +target_link_libraries( + ldapclientsearchconfigreadconfigjobtest + Qt::Test + KPim6::LdapCore + KF6::ConfigCore +) diff --git a/src/core/autotests/testkldap.cpp b/src/core/autotests/testkldap.cpp index 6b9efda8..af9548ac 100644 --- a/src/core/autotests/testkldap.cpp +++ b/src/core/autotests/testkldap.cpp @@ -301,7 +301,7 @@ void KLdapTest::testLdapModel() QCOMPARE( url.dn(), QStringLiteral("ou=People,dc=kde,dc=org") ); LdapServer server; -// url.setUrl("ldaps://cn=manager,dc=kde,dc=org:passwor@localhost:3999/" +// url.setUrl("ldaps://cn=manager,dc=kde,dc=org:password@localhost:3999/" "dc=kde,dc=org????x-timelimt=5,x-sizelimit=6,x=pagesize=7,binddn=cn=apple,ou=berry"); url.setUrl("ldaps://cn=manager,dc=kde,dc=org:password@localhost:3999/" "dc=kde,dc=org??base??x-timelimit=5"); diff --git a/src/core/ldapsearch.cpp b/src/core/ldapsearch.cpp index 21ba5c0c..9f40b10e 100644 --- a/src/core/ldapsearch.cpp +++ b/src/core/ldapsearch.cpp @@ -205,7 +205,7 @@ bool LdapSearchPrivate::startSearch(const LdapDN &base, LdapUrl::Scope scope, co LdapControls savedctrls = mOp.serverControls(); if (pagesize) { LdapControls ctrls = savedctrls; - mConn->setOption(0x0008, nullptr); // Disable referals or paging won't work + mConn->setOption(0x0008, nullptr); // Disable referrals or paging won't work LdapControl::insert(ctrls, LdapControl::createPageControl(pagesize)); mOp.setServerControls(ctrls); } diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index c37da78e..7dece509 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -10,19 +10,19 @@ ecm_setup_version(PROJECT VARIABLE_PREFIX KLDAPWIDGETS add_library(KPim6LdapWidgets) add_library(KPim6::LdapWidgets ALIAS KPim6LdapWidgets) -target_sources(KPim6LdapWidgets PRIVATE - ldapconfigwidget.cpp - addhostdialog.cpp - ldapconfigurewidgetng.cpp - - addhostdialog.h - ldapconfigwidget.h - ldapconfigurewidgetng.h - - ldapconfigurewidgetng.cpp - ldapconfigurewidgetng.h - ldapactivitiesabstractplugin.h - ldapactivitiesabstractplugin.cpp +target_sources( + KPim6LdapWidgets + PRIVATE + ldapconfigwidget.cpp + addhostdialog.cpp + ldapconfigurewidgetng.cpp + addhostdialog.h + ldapconfigwidget.h + ldapconfigurewidgetng.h + ldapconfigurewidgetng.cpp + ldapconfigurewidgetng.h + ldapactivitiesabstractplugin.h + ldapactivitiesabstractplugin.cpp ) ecm_qt_declare_logging_category(KPim6LdapWidgets HEADER ldap_widgets_debug.h IDENTIFIER LDAP_LOG CATEGORY_NAME org.kde.pim.ldap.widgets @@ -42,33 +42,45 @@ if(COMPILE_WITH_UNITY_CMAKE_SUPPORT) endif() generate_export_header(KPim6LdapWidgets BASE_NAME kldapwidgets) - - -target_link_libraries(KPim6LdapWidgets - PUBLIC - KPim6::LdapCore +target_link_libraries( + KPim6LdapWidgets + PUBLIC KPim6::LdapCore PRIVATE - Qt::Widgets - KF6::I18n - KF6::WidgetsAddons - KF6::ConfigCore - KF6::CoreAddons - KF6::KIOCore - KF6::ConfigGui + Qt::Widgets + KF6::I18n + KF6::WidgetsAddons + KF6::ConfigCore + KF6::CoreAddons + KF6::KIOCore + KF6::ConfigGui ) target_link_libraries(KPim6LdapWidgets PRIVATE qt6keychain) -target_include_directories(KPim6LdapWidgets INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPWidgets>") -target_include_directories(KPim6LdapWidgets PUBLIC "$<BUILD_INTERFACE:${KLdap_SOURCE_DIR}/src/widgets;${KLdap_BINARY_DIR}/src>") +target_include_directories( + KPim6LdapWidgets + INTERFACE + "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPWidgets>" +) +target_include_directories( + KPim6LdapWidgets + PUBLIC + "$<BUILD_INTERFACE:${KLdap_SOURCE_DIR}/src/widgets;${KLdap_BINARY_DIR}/src>" +) -set_target_properties(KPim6LdapWidgets PROPERTIES - VERSION ${KLDAPWIDGETS_VERSION} - SOVERSION ${KLDAPWIDGETS_SOVERSION} - EXPORT_NAME LdapWidgets +set_target_properties( + KPim6LdapWidgets + PROPERTIES + VERSION ${KLDAPWIDGETS_VERSION} + SOVERSION ${KLDAPWIDGETS_SOVERSION} + EXPORT_NAME LdapWidgets ) -install(TARGETS KPim6LdapWidgets EXPORT KPim6LdapWidgetsTargets ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) +install( + TARGETS KPim6LdapWidgets + EXPORT KPim6LdapWidgetsTargets + ${KDE_INSTALL_TARGETS_DEFAULT_ARGS} +) ########### install files ############### @@ -82,26 +94,26 @@ ecm_generate_headers(KLdapWidgets_CamelCase_HEADERS REQUIRED_HEADERS KLdapWidgets_HEADERS ) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/kldapwidgets_export.h - ${KLdapWidgets_HEADERS} +install( + FILES + ${CMAKE_CURRENT_BINARY_DIR}/kldapwidgets_export.h + ${KLdapWidgets_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPWidgets/kldapwidgets COMPONENT Devel ) -install(FILES - ${KLdapWidgets_CamelCase_HEADERS} +install( + FILES ${KLdapWidgets_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPWidgets/KLDAPWidgets/ COMPONENT Devel ) -install(FILES - ${CMAKE_CURRENT_BINARY_DIR}/kldap_widgets_version.h +install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/kldap_widgets_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KPim6/KLDAPWidgets COMPONENT Devel ) - if(BUILD_QCH) ecm_add_qch( KPim6LdapWidgets_QCH @@ -125,7 +137,7 @@ if(BUILD_QCH) TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel -) + ) endif() if(BUILD_TESTING) @@ -135,8 +147,12 @@ endif() set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KPim6LdapWidgets") -install(EXPORT KPim6LdapWidgetsTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KPim6LdapWidgetsTargets.cmake NAMESPACE KPim6::) - +install( + EXPORT KPim6LdapWidgetsTargets + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + FILE KPim6LdapWidgetsTargets.cmake + NAMESPACE KPim6:: +) if(BUILD_QCH) ecm_install_qch_export( @@ -144,21 +160,22 @@ if(BUILD_QCH) FILE KPim6LdapWidgetsQchTargets.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel -) -set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6LdapWidgetsQchTargets.cmake\")") + ) + set(PACKAGE_INCLUDE_QCHTARGETS + "include(\"\${CMAKE_CURRENT_LIST_DIR}/KPim6LdapWidgetsQchTargets.cmake\")" + ) endif() - configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/KPimLdapWidgetsConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapWidgetsConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapWidgetsConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapWidgetsConfigVersion.cmake" +install( + FILES + "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapWidgetsConfig.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/KPim6LdapWidgetsConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) -
