diff --git a/cmake/modules/KDevelopMacrosInternal.cmake b/cmake/modules/KDevelopMacrosInternal.cmake index 3289066f4b..5c78bf54d5 100644 --- a/cmake/modules/KDevelopMacrosInternal.cmake +++ b/cmake/modules/KDevelopMacrosInternal.cmake @@ -1,59 +1,182 @@ # # KDevelop Private Macros # # The following macros are defined here: # # add_compile_flag_if_supported( [CXX_ONLY]) # add_target_compile_flag_if_supported( ) +# declare_qt_logging_category( HEADER IDENTIFIER CATEGORY_NAME EXPORT DESCRIPTION ) +# install_qt_logging_categories(EXPORT FILE ) # #============================================================================= # Copyright 2018 Friedrich W. H. Kossebau # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. # # This software is distributed WITHOUT ANY WARRANTY; without even the # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. # See the License for more information. #============================================================================= # helper method to ensure consistent cache var names function(_varname_for_compile_flag_check_result _varname _flag ) string(REGEX REPLACE "[-=]" "_" _varname ${_flag}) string(TOUPPER ${_varname} _varname) set(_varname "KDEV_HAVE${_varname}" PARENT_SCOPE) endfunction() # add_compile_flag_if_supported( [CXX_ONLY]) # Optional argument CXX_ONLY to set the flag only for C++ code. # # Example: # add_compile_flag_if_supported(-Wsuggest-override CXX_ONLY) function(add_compile_flag_if_supported _flag) _varname_for_compile_flag_check_result(_varname ${_flag}) check_cxx_compiler_flag("${_flag}" "${_varname}") if (${${_varname}}) if("${ARGV1}" STREQUAL "CXX_ONLY") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${_flag}" PARENT_SCOPE) else() add_compile_options(${_flag}) endif() endif() endfunction() # add_target_compile_flag_if_supported( ) # # Example: # add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-suggest-override") function(add_target_compile_flag_if_supported _target _scope _flag) _varname_for_compile_flag_check_result(_varname ${_flag}) check_cxx_compiler_flag("${_flag}" "${_varname}") if (${${_varname}}) target_compile_options(${_target} ${_scope} "${_flag}") endif() endfunction() + + +# declare_qt_logging_category( HEADER IDENTIFIER CATEGORY_NAME EXPORT DESCRIPTION ) +# +# Example: +# declare_qt_logging_category(Foo_LIB_SRCS +# HEADER debug.h +# IDENTIFIER DOCUMENTATION +# CATEGORY_NAME "bar.foo" +# DESCRIPTION "The foo of bar" +# EXPORT BarCategories +# ) +macro(declare_qt_logging_category _sources) + set(options ) + set(oneValueArgs HEADER IDENTIFIER CATEGORY_NAME EXPORT DESCRIPTION) + set(multiValueArgs) + + cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + if(NOT DEFINED ARGS_HEADER) + message(FATAL_ERROR "HEADER needs to be defined when calling declare_qt_logging_category().") + endif() + if(NOT DEFINED ARGS_IDENTIFIER) + message(FATAL_ERROR "IDENTIFIER needs to be defined when calling declare_qt_logging_category().") + endif() + if(NOT DEFINED ARGS_CATEGORY_NAME) + message(FATAL_ERROR "CATEGORY_NAME needs to be defined when calling declare_qt_logging_category().") + endif() + if(NOT DEFINED ARGS_DESCRIPTION) + message(FATAL_ERROR "DESCRIPTION needs to be defined when calling declare_qt_logging_category().") + endif() + + ecm_qt_declare_logging_category(${_sources} + HEADER ${ARGS_HEADER} + IDENTIFIER ${ARGS_IDENTIFIER} + CATEGORY_NAME ${ARGS_CATEGORY_NAME} + ) + + # Nasty hack: we create a target just to store all the category data in some build-system global object + # which then can be accessed from other places like install_qt_logging_categories(). + # we also create it here on first usage, to spare some additional call. + # Better idea how to solve that welcome + set(_targetname "qt_logging_category_${ARGS_EXPORT}") + if (NOT TARGET ${_targetname}) + add_custom_target(${_targetname}) + set(_categories ${ARGS_CATEGORY_NAME}) + else() + get_target_property(_value ${_targetname} CATEGORIES) + set(_categories "${_value};${ARGS_CATEGORY_NAME}") + endif() + set_property(TARGET ${_targetname} PROPERTY CATEGORIES "${_categories}") + set_property(TARGET ${_targetname} PROPERTY "IDENTIFIER_${ARGS_CATEGORY_NAME}" "${ARGS_IDENTIFIER}") + set_property(TARGET ${_targetname} PROPERTY "DESCRIPTION_${ARGS_CATEGORY_NAME}" "${ARGS_DESCRIPTION}") +endmacro() + + +# install_qt_logging_categories(EXPORT FILE ) +# +# Needs to be called after the last declare_qt_logging_category call which uses the same EXPORT name. +# +# Example: +# install_qt_logging_categories( +# EXPORT KDevPlatformCategories +# FILE kdevplatform.test.categories +# ) +function(install_qt_logging_categories) + set(options ) + set(oneValueArgs FILE EXPORT) + set(multiValueArgs) + + cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + if(NOT DEFINED ARGS_FILE) + message(FATAL_ERROR "FILE needs to be defined when calling install_qt_logging_categories().") + endif() + + if(NOT DEFINED ARGS_EXPORT) + message(FATAL_ERROR "EXPORT needs to be defined when calling install_qt_logging_categories().") + endif() + + set(_targetname "qt_logging_category_${ARGS_EXPORT}") + if (NOT TARGET ${_targetname}) + message(FATAL_ERROR "${ARGS_EXPORT} is an unknown qt logging category export name.") + endif() + + get_target_property(_categories ${_targetname} CATEGORIES) + list(SORT _categories) + + set(_content +"# KDebugSettings data file +# This file was generated by install_qt_logging_categories(). DO NOT EDIT! + +") + + foreach(_category IN LISTS _categories) + get_target_property(_description ${_targetname} "DESCRIPTION_${_category}") + + # Format: + # lognamedescription + string(APPEND _content "${_category} ${_description}\n") + + # TODO: support newer not backward-compatible format as supported by kdebugsettings 18.12 + # Format: + # lognamedescription(optional DEFAULT_SEVERITY [DEFAULT_CATEGORY] as WARNING/DEBUG/INFO/CRITICAL) optional IDENTIFIER [...]) + # example: lognamedescriptionDEFAULT_SEVERITY[DEBUG]IDENTIFIER[foo] + # Needs idea how to ensure that at runtime kdebugsettings is min KA 18.12 + endforeach() + + if (NOT IS_ABSOLUTE ${ARGS_FILE}) + set(ARGS_FILE "${CMAKE_CURRENT_BINARY_DIR}/${ARGS_FILE}") + endif() + file(GENERATE + OUTPUT "${ARGS_FILE}" + CONTENT "${_content}" + ) + + install( + FILES "${ARGS_FILE}" + DESTINATION ${KDE_INSTALL_CONFDIR} + ) +endfunction() diff --git a/kdevplatform/CMakeLists.txt b/kdevplatform/CMakeLists.txt index 0f09bcfd22..6f0bed5874 100644 --- a/kdevplatform/CMakeLists.txt +++ b/kdevplatform/CMakeLists.txt @@ -1,92 +1,95 @@ # kdevplatform soversion # E.g. for KDevelop 5.2.0 => SOVERSION 52 (we only promise ABI compatibility between patch version updates) set(KDEVPLATFORM_SOVERSION ${KDEVELOP_SOVERSION}) # Increase this to reset incompatible item-repositories. # Changing KDEVELOP_VERSION automatically resets the itemrepository as well. set(KDEV_ITEMREPOSITORY_INCREMENT 1) set(KDevPlatform_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(KDevPlatform_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(CMAKE_MODULE_PATH ${KDevPlatform_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KDevPlatform") include(KDevPlatformMacros) include(KDevPlatformMacrosInternal) find_package(Grantlee5 CONFIG) set_package_properties(Grantlee5 PROPERTIES PURPOSE "Grantlee templating library, needed for file templates" URL "http://www.grantlee.org/" TYPE REQUIRED) set(Boost_ADDITIONAL_VERSIONS 1.39.0 1.39) find_package(Boost 1.35.0) set_package_properties(Boost PROPERTIES PURPOSE "Boost libraries for enabling the classbrowser" URL "http://www.boost.org" TYPE REQUIRED) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-kdevplatform.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdevplatform.h ) include_directories(${KDevPlatform_SOURCE_DIR} ${KDevPlatform_BINARY_DIR}) if(BUILD_TESTING) set(KDEV_FIND_DEP_QT5TEST "find_dependency(Qt5Test \"${QT_MIN_VERSION}\")") endif() configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KDevPlatformConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KDevPlatformConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) ecm_setup_version(PROJECT VARIABLE_PREFIX KDEVPLATFORM VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdevplatform_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDevPlatformConfigVersion.cmake" SOVERSION ${KDEVPLATFORM_SOVERSION} ) string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_TOLOWER) if(CMAKE_BUILD_TYPE_TOLOWER MATCHES "debug" OR CMAKE_BUILD_TYPE_TOLOWER STREQUAL "") set(COMPILER_OPTIMIZATIONS_DISABLED TRUE) else() set(COMPILER_OPTIMIZATIONS_DISABLED FALSE) endif() add_subdirectory(sublime) add_subdirectory(interfaces) add_subdirectory(project) add_subdirectory(language) add_subdirectory(shell) add_subdirectory(util) add_subdirectory(outputview) add_subdirectory(vcs) add_subdirectory(pics) add_subdirectory(debugger) add_subdirectory(documentation) add_subdirectory(serialization) add_subdirectory(template) if(BUILD_TESTING) add_subdirectory(tests) endif() install( FILES "${KDevPlatform_BINARY_DIR}/kdevplatform_version.h" "${KDevPlatform_BINARY_DIR}/config-kdevplatform.h" DESTINATION "${KDE_INSTALL_INCLUDEDIR}/kdevplatform" ) install( FILES "${KDevPlatform_BINARY_DIR}/KDevPlatformConfig.cmake" "${KDevPlatform_BINARY_DIR}/KDevPlatformConfigVersion.cmake" cmake/modules/KDevPlatformMacros.cmake DESTINATION "${CMAKECONFIG_INSTALL_DIR}" ) install( EXPORT KDevPlatformTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" NAMESPACE KDev:: FILE KDevPlatformTargets.cmake ) # kdebugsettings file -install( FILES kdevplatform.categories DESTINATION ${KDE_INSTALL_CONFDIR} ) +install_qt_logging_categories( + EXPORT KDevPlatformCategories + FILE kdevplatform.categories +) diff --git a/kdevplatform/debugger/CMakeLists.txt b/kdevplatform/debugger/CMakeLists.txt index 24b70c0504..ee266ea276 100644 --- a/kdevplatform/debugger/CMakeLists.txt +++ b/kdevplatform/debugger/CMakeLists.txt @@ -1,71 +1,73 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") set(KDevPlatformDebugger_LIB_SRCS interfaces/idebugsession.cpp interfaces/iframestackmodel.cpp interfaces/ibreakpointcontroller.cpp interfaces/ivariablecontroller.cpp util/treeitem.cpp util/treemodel.cpp util/treeview.cpp util/pathmappings.cpp breakpoint/breakpoint.cpp breakpoint/breakpointmodel.cpp breakpoint/breakpointwidget.cpp breakpoint/breakpointdetails.cpp variable/variablewidget.cpp variable/variablecollection.cpp variable/variabletooltip.cpp variable/variablesortmodel.cpp framestack/framestackmodel.cpp framestack/framestackwidget.cpp ) -ecm_qt_declare_logging_category(KDevPlatformDebugger_LIB_SRCS +declare_qt_logging_category(KDevPlatformDebugger_LIB_SRCS HEADER debug.h IDENTIFIER DEBUGGER CATEGORY_NAME "kdevplatform.debugger" + DESCRIPTION "KDevPlatform lib: debugger" + EXPORT KDevPlatformCategories ) kdevplatform_add_library(KDevPlatformDebugger SOURCES ${KDevPlatformDebugger_LIB_SRCS}) target_link_libraries(KDevPlatformDebugger PUBLIC KDev::Interfaces KDev::Util PRIVATE KDev::Sublime KF5::Notifications KF5::TextEditor ) install(FILES interfaces/idebugsession.h interfaces/ibreakpointcontroller.h interfaces/ivariablecontroller.h interfaces/iframestackmodel.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/debugger/interfaces COMPONENT Devel ) install(FILES util/treemodel.h util/treeitem.h util/treeview.h util/pathmappings.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/debugger/util COMPONENT Devel ) install(FILES breakpoint/breakpointwidget.h breakpoint/breakpointdetails.h breakpoint/breakpoint.h breakpoint/breakpointmodel.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/debugger/breakpoint COMPONENT Devel ) install(FILES variable/variablecollection.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/debugger/variable COMPONENT Devel ) install(FILES framestack/framestackmodel.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/debugger/framestack COMPONENT Devel ) if(BUILD_TESTING) add_subdirectory(tests) endif() diff --git a/kdevplatform/documentation/CMakeLists.txt b/kdevplatform/documentation/CMakeLists.txt index 0f2419a028..d446a9366d 100644 --- a/kdevplatform/documentation/CMakeLists.txt +++ b/kdevplatform/documentation/CMakeLists.txt @@ -1,51 +1,53 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") find_package(Qt5WebEngineWidgets CONFIG) if(TARGET Qt5::WebEngineWidgets) set_package_properties(Qt5WebEngineWidgets PROPERTIES PURPOSE "QtWebEngine, for integrated documentation" URL "http://qt-project.org/" TYPE REQUIRED) else() find_package(Qt5WebKitWidgets CONFIG) set_package_properties(Qt5WebKitWidgets PROPERTIES PURPOSE "QtWebKit, for integrated documentation" URL "http://qt-project.org/" TYPE REQUIRED) set(USE_QTWEBKIT 1) endif() set(KDevPlatformDocumentation_LIB_SRCS standarddocumentationview.cpp documentationfindwidget.cpp documentationview.cpp ) -ecm_qt_declare_logging_category(KDevPlatformDocumentation_LIB_SRCS +declare_qt_logging_category(KDevPlatformDocumentation_LIB_SRCS HEADER debug.h IDENTIFIER DOCUMENTATION CATEGORY_NAME "kdevplatform.documentation" + DESCRIPTION "KDevPlatform lib: documentation" + EXPORT KDevPlatformCategories ) ki18n_wrap_ui(KDevPlatformDocumentation_LIB_SRCS documentationfindwidget.ui) kdevplatform_add_library(KDevPlatformDocumentation SOURCES ${KDevPlatformDocumentation_LIB_SRCS}) target_link_libraries(KDevPlatformDocumentation PUBLIC KDev::Interfaces PRIVATE KDev::Util ) if(USE_QTWEBKIT) target_link_libraries(KDevPlatformDocumentation PRIVATE Qt5::WebKitWidgets) target_compile_definitions(KDevPlatformDocumentation PRIVATE -DUSE_QTWEBKIT) else() target_link_libraries(KDevPlatformDocumentation PRIVATE Qt5::WebEngineWidgets) endif() install(FILES documentationfindwidget.h standarddocumentationview.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/documentation COMPONENT Devel ) diff --git a/kdevplatform/kdevplatform.categories b/kdevplatform/kdevplatform.categories deleted file mode 100644 index f4bcceddc2..0000000000 --- a/kdevplatform/kdevplatform.categories +++ /dev/null @@ -1,16 +0,0 @@ -# KDebugSettings data file -# Format: -# lognamedescription - -# Libraries -kdevplatform.debugger KDevPlatform lib: debugger -kdevplatform.documentation KDevPlatform lib: documentation -kdevplatform.filemanager KDevPlatform lib: filemanager -kdevplatform.language KDevPlatform lib: language -kdevplatform.outputview KDevPlatform lib: outputview -kdevplatform.project KDevPlatform lib: project -kdevplatform.serialization KDevPlatform lib: serialization -kdevplatform.shell KDevPlatform lib: shell -kdevplatform.sublime KDevPlatform lib: sublime -kdevplatform.util KDevPlatform lib: util -kdevplatform.vcs KDevPlatform lib: vcs diff --git a/kdevplatform/language/CMakeLists.txt b/kdevplatform/language/CMakeLists.txt index c30449477a..aed9dbc784 100644 --- a/kdevplatform/language/CMakeLists.txt +++ b/kdevplatform/language/CMakeLists.txt @@ -1,404 +1,406 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") # Check whether malloc_trim(3) is supported. include(CheckIncludeFile) include(CheckSymbolExists) check_include_file("malloc.h" HAVE_MALLOC_H) check_symbol_exists(malloc_trim "malloc.h" HAVE_MALLOC_TRIM) # TODO: fix duchain/stringhelpers.cpp and drop this again remove_definitions( -DQT_NO_CAST_FROM_ASCII ) if(BUILD_TESTING) add_subdirectory(highlighting/tests) add_subdirectory(duchain/tests) add_subdirectory(backgroundparser/tests) add_subdirectory(codegen/tests) add_subdirectory(util/tests) endif() configure_file(${CMAKE_CURRENT_SOURCE_DIR}/language-features.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/language-features.h ) set(KDevPlatformLanguage_LIB_SRCS assistant/staticassistantsmanager.cpp assistant/renameaction.cpp assistant/renameassistant.cpp assistant/renamefileaction.cpp assistant/staticassistant.cpp editor/persistentmovingrangeprivate.cpp editor/persistentmovingrange.cpp editor/modificationrevisionset.cpp editor/modificationrevision.cpp backgroundparser/backgroundparser.cpp backgroundparser/parsejob.cpp backgroundparser/documentchangetracker.cpp backgroundparser/parseprojectjob.cpp backgroundparser/urlparselock.cpp duchain/specializationstore.cpp duchain/codemodel.cpp duchain/duchain.cpp duchain/waitforupdate.cpp duchain/duchainpointer.cpp duchain/ducontext.cpp duchain/indexedducontext.cpp duchain/indexedtopducontext.cpp duchain/localindexedducontext.cpp duchain/indexeddeclaration.cpp duchain/localindexeddeclaration.cpp duchain/topducontext.cpp duchain/topducontextdynamicdata.cpp duchain/topducontextutils.cpp duchain/functiondefinition.cpp duchain/declaration.cpp duchain/classmemberdeclaration.cpp duchain/classfunctiondeclaration.cpp duchain/classdeclaration.cpp duchain/use.cpp duchain/forwarddeclaration.cpp duchain/duchainbase.cpp duchain/duchainlock.cpp duchain/identifier.cpp duchain/parsingenvironment.cpp duchain/abstractfunctiondeclaration.cpp duchain/functiondeclaration.cpp duchain/stringhelpers.cpp duchain/namespacealiasdeclaration.cpp duchain/aliasdeclaration.cpp duchain/dumpdotgraph.cpp duchain/duchainutils.cpp duchain/declarationid.cpp duchain/definitions.cpp duchain/uses.cpp duchain/importers.cpp duchain/duchaindumper.cpp duchain/duchainregister.cpp duchain/persistentsymboltable.cpp duchain/instantiationinformation.cpp duchain/problem.cpp duchain/types/typesystem.cpp duchain/types/typeregister.cpp duchain/types/typerepository.cpp duchain/types/identifiedtype.cpp duchain/types/abstracttype.cpp duchain/types/integraltype.cpp duchain/types/functiontype.cpp duchain/types/structuretype.cpp duchain/types/pointertype.cpp duchain/types/referencetype.cpp duchain/types/delayedtype.cpp duchain/types/arraytype.cpp duchain/types/indexedtype.cpp duchain/types/enumerationtype.cpp duchain/types/constantintegraltype.cpp duchain/types/enumeratortype.cpp duchain/types/typeutils.cpp duchain/types/typealiastype.cpp duchain/types/unsuretype.cpp duchain/types/containertypes.cpp duchain/builders/dynamiclanguageexpressionvisitor.cpp duchain/navigation/problemnavigationcontext.cpp duchain/navigation/abstractnavigationwidget.cpp duchain/navigation/abstractnavigationcontext.cpp duchain/navigation/usesnavigationcontext.cpp duchain/navigation/abstractdeclarationnavigationcontext.cpp duchain/navigation/abstractincludenavigationcontext.cpp duchain/navigation/useswidget.cpp duchain/navigation/usescollector.cpp interfaces/abbreviations.cpp interfaces/iastcontainer.cpp interfaces/ilanguagesupport.cpp interfaces/quickopendataprovider.cpp interfaces/iquickopen.cpp interfaces/editorcontext.cpp interfaces/codecontext.cpp interfaces/icreateclasshelper.cpp interfaces/icontextbrowser.cpp codecompletion/codecompletion.cpp codecompletion/codecompletionworker.cpp codecompletion/codecompletionmodel.cpp codecompletion/codecompletionitem.cpp codecompletion/codecompletioncontext.cpp codecompletion/codecompletionitemgrouper.cpp codecompletion/codecompletionhelper.cpp codecompletion/normaldeclarationcompletionitem.cpp codegen/applychangeswidget.cpp codegen/coderepresentation.cpp codegen/documentchangeset.cpp codegen/duchainchangeset.cpp codegen/utilities.cpp codegen/codedescription.cpp codegen/basicrefactoring.cpp codegen/progressdialogs/refactoringdialog.cpp util/setrepository.cpp util/includeitem.cpp util/navigationtooltip.cpp highlighting/colorcache.cpp highlighting/configurablecolors.cpp highlighting/codehighlighting.cpp checks/dataaccessrepository.cpp checks/dataaccess.cpp checks/controlflowgraph.cpp checks/controlflownode.cpp classmodel/classmodel.cpp classmodel/classmodelnode.cpp classmodel/classmodelnodescontroller.cpp classmodel/allclassesfolder.cpp classmodel/documentclassesfolder.cpp classmodel/projectfolder.cpp codegen/templatesmodel.cpp codegen/templatepreviewicon.cpp codegen/templateclassgenerator.cpp codegen/sourcefiletemplate.cpp codegen/templaterenderer.cpp codegen/templateengine.cpp codegen/archivetemplateloader.cpp ) -ecm_qt_declare_logging_category(KDevPlatformLanguage_LIB_SRCS +declare_qt_logging_category(KDevPlatformLanguage_LIB_SRCS HEADER debug.h IDENTIFIER LANGUAGE CATEGORY_NAME "kdevplatform.language" + DESCRIPTION "KDevPlatform lib: language" + EXPORT KDevPlatformCategories ) ki18n_wrap_ui(KDevPlatformLanguage_LIB_SRCS codegen/basicrefactoring.ui codegen/progressdialogs/refactoringdialog.ui) kdevplatform_add_library(KDevPlatformLanguage SOURCES ${KDevPlatformLanguage_LIB_SRCS}) target_include_directories(KDevPlatformLanguage PRIVATE ${Boost_INCLUDE_DIRS}) target_link_libraries(KDevPlatformLanguage PUBLIC KDev::Serialization KDev::Interfaces KDev::Util KF5::ThreadWeaver PRIVATE KDev::Project KF5::GuiAddons KF5::TextEditor KF5::Parts KF5::Archive KF5::IconThemes Grantlee5::Templates ) install(FILES assistant/renameaction.h assistant/renameassistant.h assistant/staticassistant.h assistant/staticassistantsmanager.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/assistant COMPONENT Devel ) install(FILES interfaces/ilanguagesupport.h interfaces/icodehighlighting.h interfaces/quickopendataprovider.h interfaces/quickopenfilter.h interfaces/iquickopen.h interfaces/codecontext.h interfaces/editorcontext.h interfaces/iastcontainer.h interfaces/icreateclasshelper.h interfaces/icontextbrowser.h interfaces/abbreviations.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/interfaces COMPONENT Devel ) install(FILES editor/persistentmovingrange.h editor/documentrange.h editor/documentcursor.h editor/cursorinrevision.h editor/rangeinrevision.h editor/modificationrevision.h editor/modificationrevisionset.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/editor COMPONENT Devel ) install(FILES backgroundparser/backgroundparser.h backgroundparser/parsejob.h backgroundparser/parseprojectjob.h backgroundparser/urlparselock.h backgroundparser/documentchangetracker.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/backgroundparser COMPONENT Devel ) install(FILES util/navigationtooltip.h util/setrepository.h util/basicsetrepository.h util/includeitem.h util/debuglanguageparserhelper.h util/kdevhash.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/util COMPONENT Devel ) install(FILES duchain/parsingenvironment.h duchain/duchain.h duchain/codemodel.h duchain/ducontext.h duchain/ducontextdata.h duchain/topducontext.h duchain/topducontextutils.h duchain/topducontextdata.h duchain/declaration.h duchain/declarationdata.h duchain/classmemberdeclaration.h duchain/classmemberdeclarationdata.h duchain/classfunctiondeclaration.h duchain/classdeclaration.h duchain/functiondefinition.h duchain/use.h duchain/forwarddeclaration.h duchain/duchainbase.h duchain/duchainpointer.h duchain/duchainlock.h duchain/identifier.h duchain/abstractfunctiondeclaration.h duchain/functiondeclaration.h duchain/stringhelpers.h duchain/safetycounter.h duchain/namespacealiasdeclaration.h duchain/aliasdeclaration.h duchain/dumpdotgraph.h duchain/duchainutils.h duchain/duchaindumper.h duchain/declarationid.h duchain/appendedlist.h duchain/duchainregister.h duchain/persistentsymboltable.h duchain/instantiationinformation.h duchain/specializationstore.h duchain/indexedducontext.h duchain/indexedtopducontext.h duchain/localindexedducontext.h duchain/indexeddeclaration.h duchain/localindexeddeclaration.h duchain/definitions.h duchain/problem.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/duchain COMPONENT Devel ) install(FILES duchain/types/unsuretype.h duchain/types/identifiedtype.h duchain/types/typesystem.h duchain/types/typeregister.h duchain/types/typerepository.h duchain/types/typepointer.h duchain/types/typesystemdata.h duchain/types/abstracttype.h duchain/types/integraltype.h duchain/types/functiontype.h duchain/types/structuretype.h duchain/types/pointertype.h duchain/types/referencetype.h duchain/types/delayedtype.h duchain/types/arraytype.h duchain/types/indexedtype.h duchain/types/enumerationtype.h duchain/types/constantintegraltype.h duchain/types/enumeratortype.h duchain/types/alltypes.h duchain/types/typeutils.h duchain/types/typealiastype.h duchain/types/containertypes.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/duchain/types COMPONENT Devel ) install(FILES duchain/builders/abstractcontextbuilder.h duchain/builders/abstractdeclarationbuilder.h duchain/builders/abstracttypebuilder.h duchain/builders/abstractusebuilder.h duchain/builders/dynamiclanguageexpressionvisitor.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/duchain/builders COMPONENT Devel ) install(FILES codecompletion/codecompletion.h codecompletion/codecompletionworker.h codecompletion/codecompletionmodel.h codecompletion/codecompletionitem.h codecompletion/codecompletioncontext.h codecompletion/codecompletionitemgrouper.h codecompletion/codecompletionhelper.h codecompletion/normaldeclarationcompletionitem.h codecompletion/abstractincludefilecompletionitem.h codecompletion/codecompletiontesthelper.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/codecompletion COMPONENT Devel ) install(FILES codegen/applychangeswidget.h codegen/astchangeset.h codegen/duchainchangeset.h codegen/documentchangeset.h codegen/coderepresentation.h codegen/utilities.h codegen/templatesmodel.h codegen/templatepreviewicon.h codegen/templaterenderer.h codegen/templateengine.h codegen/sourcefiletemplate.h codegen/templateclassgenerator.h codegen/codedescription.h codegen/basicrefactoring.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/codegen COMPONENT Devel ) install(FILES duchain/navigation/usesnavigationcontext.h duchain/navigation/abstractnavigationcontext.h duchain/navigation/abstractdeclarationnavigationcontext.h duchain/navigation/abstractincludenavigationcontext.h duchain/navigation/abstractnavigationwidget.h duchain/navigation/navigationaction.h duchain/navigation/useswidget.h duchain/navigation/usescollector.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/duchain/navigation COMPONENT Devel ) install(FILES highlighting/codehighlighting.h highlighting/colorcache.h highlighting/configurablecolors.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/highlighting COMPONENT Devel ) install(FILES checks/dataaccess.h checks/dataaccessrepository.h checks/controlflowgraph.h checks/controlflownode.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/checks COMPONENT Devel ) install(FILES classmodel/classmodel.h classmodel/classmodelnode.h classmodel/classmodelnodescontroller.h classmodel/allclassesfolder.h classmodel/documentclassesfolder.h classmodel/projectfolder.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/language/classmodel COMPONENT Devel ) diff --git a/kdevplatform/outputview/CMakeLists.txt b/kdevplatform/outputview/CMakeLists.txt index 1f56b5551f..cf0890bb7b 100644 --- a/kdevplatform/outputview/CMakeLists.txt +++ b/kdevplatform/outputview/CMakeLists.txt @@ -1,44 +1,46 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") set(outputviewinterfaces_LIB_SRCS outputdelegate.cpp outputformats.cpp filtereditem.cpp ifilterstrategy.cpp outputmodel.cpp ioutputview.cpp ioutputviewmodel.cpp outputfilteringstrategies.cpp outputjob.cpp outputexecutejob.cpp ) -ecm_qt_declare_logging_category(outputviewinterfaces_LIB_SRCS +declare_qt_logging_category(outputviewinterfaces_LIB_SRCS HEADER debug.h IDENTIFIER OUTPUTVIEW CATEGORY_NAME "kdevplatform.outputview" + DESCRIPTION "KDevPlatform lib: outputview" + EXPORT KDevPlatformCategories ) kdevplatform_add_library(KDevPlatformOutputView SOURCES ${outputviewinterfaces_LIB_SRCS}) target_link_libraries(KDevPlatformOutputView PUBLIC KF5::CoreAddons Qt5::Widgets PRIVATE KDev::Interfaces KDev::Util ) install(FILES ioutputview.h filtereditem.h outputmodel.h outputdelegate.h outputfilteringstrategies.h ioutputviewmodel.h ifilterstrategy.h outputjob.h outputexecutejob.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/outputview COMPONENT Devel) if(BUILD_TESTING) add_subdirectory(tests) endif() diff --git a/kdevplatform/project/CMakeLists.txt b/kdevplatform/project/CMakeLists.txt index 93c528d9ce..83fb1ab95e 100644 --- a/kdevplatform/project/CMakeLists.txt +++ b/kdevplatform/project/CMakeLists.txt @@ -1,75 +1,90 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") set(KDevPlatformProject_LIB_SRCS projectutils.cpp projectmodel.cpp projectchangesmodel.cpp projectconfigskeleton.cpp importprojectjob.cpp builderjob.cpp projectbuildsetmodel.cpp projectitemlineedit.cpp helper.cpp - debug.cpp projectproxymodel.cpp abstractfilemanagerplugin.cpp filemanagerlistjob.cpp projectfiltermanager.cpp interfaces/iprojectbuilder.cpp interfaces/iprojectfilemanager.cpp interfaces/ibuildsystemmanager.cpp interfaces/iprojectfilter.cpp interfaces/iprojectfilterprovider.cpp widgets/dependencieswidget.cpp ) +declare_qt_logging_category(KDevPlatformProject_LIB_SRCS + HEADER debug_project.h + IDENTIFIER PROJECT + CATEGORY_NAME "kdevplatform.project" + DESCRIPTION "KDevPlatform lib: project" + EXPORT KDevPlatformCategories +) + +declare_qt_logging_category(KDevPlatformProject_LIB_SRCS + HEADER debug_filemanager.h + IDENTIFIER FILEMANAGER + CATEGORY_NAME "kdevplatform.filemanager" + DESCRIPTION "KDevPlatform lib: filemanager" + EXPORT KDevPlatformCategories +) + ki18n_wrap_ui( KDevPlatformProject_LIB_SRCS widgets/dependencieswidget.ui) kdevplatform_add_library(KDevPlatformProject SOURCES ${KDevPlatformProject_LIB_SRCS}) target_link_libraries(KDevPlatformProject PUBLIC KDev::Interfaces KDev::Util # util/path.h KDev::Vcs PRIVATE KDev::Interfaces KDev::Serialization KF5::KIOWidgets Qt5::Concurrent ) if(BUILD_TESTING) if(BUILD_TESTING) add_subdirectory(tests) endif() endif() install(FILES interfaces/iprojectbuilder.h interfaces/iprojectfilemanager.h interfaces/ibuildsystemmanager.h interfaces/iprojectfilter.h interfaces/iprojectfilterprovider.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/project/interfaces COMPONENT Devel ) install(FILES projectutils.h importprojectjob.h projectchangesmodel.h projectconfigskeleton.h projectmodel.h projectconfigpage.h projectitemlineedit.h projectbuildsetmodel.h builderjob.h helper.h abstractfilemanagerplugin.h projectfiltermanager.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/project COMPONENT Devel ) install(FILES widgets/dependencieswidget.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/project/widgets COMPONENT Devel ) diff --git a/kdevplatform/project/debug.cpp b/kdevplatform/project/debug.cpp deleted file mode 100644 index 814c56eef2..0000000000 --- a/kdevplatform/project/debug.cpp +++ /dev/null @@ -1,26 +0,0 @@ -/* - * This file is part of KDevelop - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library General Public License as - * published by the Free Software Foundation; either version 2 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, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "debug.h" - -// TODO: ecm_qt_declare_logging_category only supports one category -// so generate two separate files with a wrapper debug.h, or have code include explicit matching header? -const QtMsgType defaultMsgType = QtInfoMsg; -Q_LOGGING_CATEGORY(PROJECT, "kdevplatform.project", defaultMsgType) -Q_LOGGING_CATEGORY(FILEMANAGER, "kdevplatform.filemanager", defaultMsgType) diff --git a/kdevplatform/project/debug.h b/kdevplatform/project/debug.h index 49f3d171dc..e374219298 100644 --- a/kdevplatform/project/debug.h +++ b/kdevplatform/project/debug.h @@ -1,27 +1,26 @@ /* * This file is part of KDevelop * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU Library General Public License as * published by the Free Software Foundation; either version 2 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, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #ifndef KDEVPLATFORM_PROJECT_DEBUG_H #define KDEVPLATFORM_PROJECT_DEBUG_H -#include -Q_DECLARE_LOGGING_CATEGORY(PROJECT) -Q_DECLARE_LOGGING_CATEGORY(FILEMANAGER) +#include +#include #endif diff --git a/kdevplatform/serialization/CMakeLists.txt b/kdevplatform/serialization/CMakeLists.txt index 1313eef04b..1ad90883dc 100644 --- a/kdevplatform/serialization/CMakeLists.txt +++ b/kdevplatform/serialization/CMakeLists.txt @@ -1,38 +1,40 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") set(KDevPlatformSerialization_LIB_SRCS abstractitemrepository.cpp indexedstring.cpp itemrepositoryregistry.cpp referencecounting.cpp ) -ecm_qt_declare_logging_category(KDevPlatformSerialization_LIB_SRCS +declare_qt_logging_category(KDevPlatformSerialization_LIB_SRCS HEADER debug.h IDENTIFIER SERIALIZATION CATEGORY_NAME "kdevplatform.serialization" + DESCRIPTION "KDevPlatform lib: serialization" + EXPORT KDevPlatformCategories ) kdevplatform_add_library(KDevPlatformSerialization SOURCES ${KDevPlatformSerialization_LIB_SRCS}) target_link_libraries(KDevPlatformSerialization PUBLIC KF5::WidgetsAddons KF5::I18n PRIVATE KDev::Util ) install(FILES abstractitemrepository.h referencecounting.h indexedstring.h itemrepositoryexampleitem.h itemrepository.h itemrepositoryregistry.h repositorymanager.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/serialization COMPONENT Devel ) if(BUILD_TESTING) add_subdirectory(tests) endif() diff --git a/kdevplatform/shell/CMakeLists.txt b/kdevplatform/shell/CMakeLists.txt index 1e9fdade50..aa59e4b2de 100644 --- a/kdevplatform/shell/CMakeLists.txt +++ b/kdevplatform/shell/CMakeLists.txt @@ -1,193 +1,195 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") if(BUILD_TESTING) add_subdirectory(tests) endif() set(KDevPlatformShell_LIB_SRCS workingsetcontroller.cpp workingsets/workingset.cpp workingsets/workingsetfilelabel.cpp workingsets/workingsettoolbutton.cpp workingsets/workingsettooltipwidget.cpp workingsets/workingsetwidget.cpp workingsets/closedworkingsetswidget.cpp workingsets/workingsethelpers.cpp mainwindow.cpp mainwindow_p.cpp plugincontroller.cpp ktexteditorpluginintegration.cpp shellextension.cpp core.cpp uicontroller.cpp colorschemechooser.cpp projectcontroller.cpp project.cpp partcontroller.cpp #document.cpp partdocument.cpp textdocument.cpp documentcontroller.cpp languagecontroller.cpp statusbar.cpp runcontroller.cpp unitylauncher.cpp sessioncontroller.cpp session.cpp sessionlock.cpp sessionchooserdialog.cpp savedialog.cpp sourceformattercontroller.cpp sourceformatterjob.cpp completionsettings.cpp openprojectpage.cpp openprojectdialog.cpp projectinfopage.cpp selectioncontroller.cpp documentationcontroller.cpp debugcontroller.cpp launchconfiguration.cpp launchconfigurationdialog.cpp loadedpluginsdialog.cpp testcontroller.cpp projectsourcepage.cpp configdialog.cpp editorconfigpage.cpp environmentconfigurebutton.cpp sourceformatterselectionedit.cpp runtimecontroller.cpp checkerstatus.cpp problem.cpp problemmodelset.cpp problemmodel.cpp problemstore.cpp watcheddocumentset.cpp filteredproblemstore.cpp progresswidget/progressmanager.cpp progresswidget/statusbarprogresswidget.cpp progresswidget/overlaywidget.cpp progresswidget/progressdialog.cpp areadisplay.cpp settings/uipreferences.cpp settings/pluginpreferences.cpp settings/sourceformattersettings.cpp settings/editstyledialog.cpp settings/projectpreferences.cpp settings/environmentwidget.cpp settings/environmentprofilemodel.cpp settings/environmentprofilelistmodel.cpp settings/environmentpreferences.cpp settings/languagepreferences.cpp settings/bgpreferences.cpp settings/templateconfig.cpp settings/templatepage.cpp settings/analyzerspreferences.cpp settings/runtimespreferences.cpp settings/documentationpreferences.cpp ) if(APPLE) set(KDevPlatformShell_LIB_SRCS ${KDevPlatformShell_LIB_SRCS} macdockprogressview.mm ) endif() -ecm_qt_declare_logging_category(KDevPlatformShell_LIB_SRCS +declare_qt_logging_category(KDevPlatformShell_LIB_SRCS HEADER debug.h IDENTIFIER SHELL CATEGORY_NAME "kdevplatform.shell" + DESCRIPTION "KDevPlatform lib: shell" + EXPORT KDevPlatformCategories ) kconfig_add_kcfg_files(KDevPlatformShell_LIB_SRCS settings/uiconfig.kcfgc settings/projectconfig.kcfgc settings/languageconfig.kcfgc settings/bgconfig.kcfgc ) ki18n_wrap_ui(KDevPlatformShell_LIB_SRCS projectinfopage.ui launchconfigurationdialog.ui projectsourcepage.ui sourceformatterselectionedit.ui settings/uiconfig.ui settings/editstyledialog.ui settings/sourceformattersettings.ui settings/projectpreferences.ui settings/environmentwidget.ui settings/languagepreferences.ui settings/bgpreferences.ui settings/templateconfig.ui settings/templatepage.ui ) qt5_add_resources(KDevPlatformShell_LIB_SRCS kdevplatformshell.qrc) kdevplatform_add_library(KDevPlatformShell SOURCES ${KDevPlatformShell_LIB_SRCS}) target_link_libraries(KDevPlatformShell PUBLIC KDev::Sublime KDev::OutputView KDev::Interfaces KDev::Language KF5::XmlGui PRIVATE KDev::Debugger KDev::Project KDev::Vcs KDev::Util KDev::Documentation KF5::GuiAddons KF5::ConfigWidgets KF5::IconThemes KF5::KIOFileWidgets KF5::KIOWidgets KF5::Parts KF5::Notifications KF5::NotifyConfig KF5::TextEditor KF5::JobWidgets KF5::ItemViews KF5::WindowSystem KF5::KCMUtils #for KPluginSelector, not sure why it is in kcmutils KF5::NewStuff # template config page KF5::Archive # template config page ) if(APPLE) target_link_libraries(KDevPlatformShell PRIVATE "-framework AppKit") endif() install(FILES mainwindow.h plugincontroller.h shellextension.h core.h uicontroller.h colorschemechooser.h projectcontroller.h project.h partcontroller.h partdocument.h textdocument.h documentcontroller.h languagecontroller.h session.h sessioncontroller.h sessionlock.h sourceformattercontroller.h selectioncontroller.h runcontroller.h launchconfiguration.h environmentconfigurebutton.h sourceformatterselectionedit.h checkerstatus.h problem.h problemmodel.h problemmodelset.h problemconstants.h filteredproblemstore.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/shell COMPONENT Devel ) diff --git a/kdevplatform/sublime/CMakeLists.txt b/kdevplatform/sublime/CMakeLists.txt index ad62f0bc08..75829e8cd5 100644 --- a/kdevplatform/sublime/CMakeLists.txt +++ b/kdevplatform/sublime/CMakeLists.txt @@ -1,58 +1,60 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") add_subdirectory(examples) if(BUILD_TESTING) add_subdirectory(tests) endif() set(sublime_LIB_SRCS area.cpp areaindex.cpp container.cpp controller.cpp document.cpp mainwindow.cpp mainwindow_p.cpp mainwindowoperator.cpp urldocument.cpp tooldocument.cpp view.cpp viewbarcontainer.cpp sublimedefs.cpp aggregatemodel.cpp holdupdates.cpp idealcontroller.cpp ideallayout.cpp idealtoolbutton.cpp idealdockwidget.cpp idealbuttonbarwidget.cpp ) -ecm_qt_declare_logging_category(sublime_LIB_SRCS +declare_qt_logging_category(sublime_LIB_SRCS HEADER debug.h IDENTIFIER SUBLIME CATEGORY_NAME "kdevplatform.sublime" + DESCRIPTION "KDevPlatform lib: sublime" + EXPORT KDevPlatformCategories ) kdevplatform_add_library(KDevPlatformSublime SOURCES ${sublime_LIB_SRCS}) target_link_libraries(KDevPlatformSublime PUBLIC KF5::Parts PRIVATE KF5::KIOWidgets ) install(FILES area.h areaindex.h areawalkers.h container.h controller.h document.h mainwindow.h mainwindowoperator.h urldocument.h sublimedefs.h tooldocument.h view.h viewbarcontainer.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/sublime COMPONENT Devel) diff --git a/kdevplatform/util/CMakeLists.txt b/kdevplatform/util/CMakeLists.txt index a4ec912ca0..19c75631d4 100644 --- a/kdevplatform/util/CMakeLists.txt +++ b/kdevplatform/util/CMakeLists.txt @@ -1,103 +1,105 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") ########### next target ############### set(KDevPlatformUtil_LIB_SRCS autoorientedsplitter.cpp foregroundlock.cpp formattinghelpers.cpp zoomcontroller.cpp kdevstringhandler.cpp focusedtreeview.cpp processlinemaker.cpp commandexecutor.cpp environmentselectionwidget.cpp environmentselectionmodel.cpp environmentprofilelist.cpp jobstatus.cpp activetooltip.cpp executecompositejob.cpp shellutils.cpp multilevellistview.cpp objectlist.cpp placeholderitemproxymodel.cpp projecttestjob.cpp widgetcolorizer.cpp path.cpp texteditorhelpers.cpp stack.cpp expandablelineedit.cpp ) set (KDevPlatformUtil_LIB_UI runoptions.ui ) if(NOT WIN32) add_subdirectory(dbus_socket_transformer) endif() if(BUILD_TESTING) add_subdirectory(duchainify) # needs KDev::Tests endif() if(BUILD_TESTING) add_subdirectory(tests) endif() -ecm_qt_declare_logging_category(KDevPlatformUtil_LIB_SRCS +declare_qt_logging_category(KDevPlatformUtil_LIB_SRCS HEADER debug.h IDENTIFIER UTIL CATEGORY_NAME "kdevplatform.util" + DESCRIPTION "KDevPlatform lib: util" + EXPORT KDevPlatformCategories ) ki18n_wrap_ui(KDevPlatformUtil_LIB_SRCS ${KDevPlatformUtil_LIB_US}) kdevplatform_add_library(KDevPlatformUtil SOURCES ${KDevPlatformUtil_LIB_SRCS}) target_link_libraries(KDevPlatformUtil PUBLIC KDev::Interfaces PRIVATE KF5::ItemModels KF5::GuiAddons ) install( FILES kdevplatform_shell_environment.sh DESTINATION bin PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ) add_executable(kdev_format_source kdevformatsource.cpp kdevformatfile.cpp) ecm_mark_nongui_executable(kdev_format_source) target_link_libraries(kdev_format_source Qt5::Core) install(TARGETS kdev_format_source DESTINATION ${KDE_INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES .zshrc PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/kdevplatform/shellutils/) ########### install files ############### install( FILES autoorientedsplitter.h foregroundlock.h formattinghelpers.h zoomcontroller.h kdevstringhandler.h ksharedobject.h focusedtreeview.h activetooltip.h processlinemaker.h commandexecutor.h environmentselectionwidget.h environmentprofilelist.h jobstatus.h pushvalue.h kdevvarlengtharray.h embeddedfreetree.h executecompositejob.h convenientfreelist.h multilevellistview.h objectlist.h placeholderitemproxymodel.h projecttestjob.h widgetcolorizer.h path.h stack.h texteditorhelpers.h ${CMAKE_CURRENT_BINARY_DIR}/utilexport.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/util COMPONENT Devel) diff --git a/kdevplatform/vcs/CMakeLists.txt b/kdevplatform/vcs/CMakeLists.txt index 36203f29aa..1b4fd8fdd1 100644 --- a/kdevplatform/vcs/CMakeLists.txt +++ b/kdevplatform/vcs/CMakeLists.txt @@ -1,121 +1,123 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevplatform\") if(BUILD_TESTING) add_subdirectory(tests) add_subdirectory(dvcs/tests) add_subdirectory(models/tests) endif() set(KDevPlatformVcs_UIS widgets/vcscommitdialog.ui widgets/vcseventwidget.ui widgets/vcsdiffwidget.ui dvcs/ui/dvcsimportmetadatawidget.ui dvcs/ui/branchmanager.ui ) set(KDevPlatformVcs_LIB_SRCS vcsjob.cpp vcsrevision.cpp vcsannotation.cpp vcspluginhelper.cpp vcslocation.cpp vcsdiff.cpp vcsevent.cpp vcsstatusinfo.cpp widgets/vcsimportmetadatawidget.cpp widgets/vcseventwidget.cpp widgets/vcsdiffwidget.cpp widgets/vcscommitdialog.cpp widgets/vcsdiffpatchsources.cpp widgets/vcslocationwidget.cpp widgets/standardvcslocationwidget.cpp models/vcsannotationmodel.cpp models/vcseventmodel.cpp models/vcsfilechangesmodel.cpp models/vcsitemeventmodel.cpp models/brancheslistmodel.cpp dvcs/dvcsjob.cpp dvcs/dvcsplugin.cpp dvcs/dvcsevent.cpp dvcs/ui/dvcsimportmetadatawidget.cpp dvcs/ui/branchmanager.cpp interfaces/ibasicversioncontrol.cpp interfaces/icontentawareversioncontrol.cpp interfaces/ipatchdocument.cpp interfaces/ipatchsource.cpp ) -ecm_qt_declare_logging_category(KDevPlatformVcs_LIB_SRCS +declare_qt_logging_category(KDevPlatformVcs_LIB_SRCS HEADER debug.h IDENTIFIER VCS CATEGORY_NAME "kdevplatform.vcs" + DESCRIPTION "KDevPlatform lib: vcs" + EXPORT KDevPlatformCategories ) ki18n_wrap_ui(KDevPlatformVcs_LIB_SRCS ${KDevPlatformVcs_UIS}) kdevplatform_add_library(KDevPlatformVcs SOURCES ${KDevPlatformVcs_LIB_SRCS}) target_link_libraries(KDevPlatformVcs PUBLIC KDev::OutputView KDev::Interfaces PRIVATE KDev::Util KF5::KIOWidgets KF5::Parts ) install(FILES vcsjob.h vcsrevision.h vcsannotation.h vcsdiff.h vcspluginhelper.h vcsevent.h vcsstatusinfo.h vcslocation.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/vcs COMPONENT Devel ) install(FILES widgets/vcsimportmetadatawidget.h widgets/vcseventwidget.h widgets/vcsdiffwidget.h widgets/vcscommitdialog.h widgets/vcslocationwidget.h widgets/standardvcslocationwidget.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/vcs/widgets COMPONENT Devel ) install(FILES models/vcsannotationmodel.h models/vcseventmodel.h models/vcsfilechangesmodel.h models/vcsitemeventmodel.h models/brancheslistmodel.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/vcs/models COMPONENT Devel ) install(FILES interfaces/ibasicversioncontrol.h interfaces/icentralizedversioncontrol.h interfaces/idistributedversioncontrol.h interfaces/ibranchingversioncontrol.h interfaces/ibrowsableversioncontrol.h interfaces/irepositoryversioncontrol.h interfaces/ipatchdocument.h interfaces/ipatchsource.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/vcs/interfaces COMPONENT Devel ) install(FILES dvcs/dvcsjob.h dvcs/dvcsplugin.h dvcs/dvcsevent.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/vcs/dvcs COMPONENT Devel ) install(FILES dvcs/ui/dvcsimportmetadatawidget.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevplatform/vcs/dvcs/ui COMPONENT Devel )