diff --git a/CMakeLists.txt b/CMakeLists.txt index dc0c67cd5d..64bef105f4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,199 +1,204 @@ cmake_minimum_required(VERSION 3.0) project(KDevelop VERSION 5.4.40) # KDevelop SOVERSION # E.g. for KDevelop 5.2.0 => SOVERSION 52 (we only promise ABI compatibility between patch version updates) set(KDEVELOP_SOVERSION 55) # plugin version as used e.g. in plugin installation path set(KDEV_PLUGIN_VERSION 33) # we need some parts of the ECM CMake helpers find_package (ECM 5.28.0 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${KDevelop_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) include(KDEInstallDirs) include(KDECMakeSettings) include(KDECompilerSettings NO_POLICY_SCOPE) # needs to be first, as set policies influence following macros include(ECMOptionalAddSubdirectory) include(ECMInstallIcons) include(ECMAddAppIcon) include(ECMSetupVersion) include(ECMAddTests) include(ECMMarkNonGuiExecutable) include(ECMGenerateHeaders) include(ECMQtDeclareLoggingCategory) include(GenerateExportHeader) include(CMakePackageConfigHelpers) include(FeatureSummary) include(WriteBasicConfigVersionFile) include(CheckFunctionExists) include(KDevelopMacrosInternal) if(POLICY CMP0071) # CMake 3.10 generates warnings when projects combine AUTOMOC with qt5_wrap_ui() or qt5_add_resources() # Avoid that by setting this policy (cf. https://bugreports.qt.io/browse/QTBUG-63442) # Note: Once we depend on a Qt which has this fix (likely Qt 5.9.4+), remove this cmake_policy(SET CMP0071 OLD) endif() set(QT_MIN_VERSION "5.7.0") find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Concurrent Quick QuickWidgets) if(BUILD_TESTING) find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) endif() set(KF5_DEP_VERSION "5.28.0") find_package(KF5 ${KF5_DEP_VERSION} REQUIRED COMPONENTS Config Declarative DocTools IconThemes I18n ItemModels ItemViews JobWidgets KCMUtils KIO NewStuff NotifyConfig Parts Service TextEditor ThreadWeaver XmlGui WindowSystem Crash GuiAddons Archive Notifications ) find_package(KF5SysGuard CONFIG) set_package_properties(KF5SysGuard PROPERTIES PURPOSE "Framework for process listing. Required for the 'Attach to Process' feature" TYPE RECOMMENDED ) find_package(KDevelop-PG-Qt 1.90.90 CONFIG) set_package_properties(KDevelop-PG-Qt PROPERTIES PURPOSE "KDevelop parser generator library. Required for the QMake Builder/Manager plugin." TYPE RECOMMENDED ) find_package(SharedMimeInfo REQUIRED) if(NOT CMAKE_VERSION VERSION_LESS "3.10.0" AND KF5_VERSION VERSION_LESS "5.42.0") # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros. # 3.10+ lets us provide more macro names that require automoc. # KF5 >= 5.42 takes care itself of adding its macros in its cmake config files list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "K_PLUGIN_FACTORY_WITH_JSON" "K_EXPORT_PLASMA_DATAENGINE_WITH_JSON" "K_EXPORT_PLASMA_RUNNER") endif() if(NOT CMAKE_VERSION VERSION_LESS "3.9.0" AND KF5_VERSION VERSION_LESS "5.44.0") # CMake's automoc needs help to find names of plugin metadata files in case Q_PLUGIN_METADATA # is indirectly used via other C++ preprocessor macros # 3.9+ lets us provide some filter rule pairs (keyword, regexp) to match the names of such files # in the plain text of the sources. See AUTOMOC_DEPEND_FILTERS docs for details. list(APPEND CMAKE_AUTOMOC_DEPEND_FILTERS "K_PLUGIN_FACTORY_WITH_JSON" "[\n^][ \t]*K_PLUGIN_FACTORY_WITH_JSON[ \t\n]*\\([^,]*,[ \t\n]*\"([^\"]+)\"" "K_EXPORT_PLASMA_DATAENGINE_WITH_JSON" "[\n^][ \t]*K_EXPORT_PLASMA_DATAENGINE_WITH_JSON[ \t\n]*\\([^,]*,[^,]*,[ \t\n]*\"([^\"]+)\"" ) endif() add_definitions( -DQT_DEPRECATED_WARNINGS -DQT_DISABLE_DEPRECATED_BEFORE=0x050700 -DQT_DEPRECATED_WARNINGS_SINCE=0x060000 -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_STRICT_ITERATORS -DQT_USE_QSTRINGBUILDER -DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT -DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x051C00 -DKF_DEPRECATED_WARNINGS_SINCE=0x060000 ) +if(NOT Qt5_VERSION VERSION_LESS "5.12.0" AND NOT KF5_VERSION VERSION_LESS "5.56.0") + add_definitions( + -DQT_NO_FOREACH + ) +endif() # Turn off missing-field-initializers warning for GCC to avoid noise from false positives with empty {} # See discussion: https://mail.kde.org/pipermail/kdevelop-devel/2014-February/046910.html add_compile_flag_if_supported(-Wno-missing-field-initializers) add_compile_flag_if_supported(-Werror=switch) add_compile_flag_if_supported(-Werror=undefined-bool-conversion) add_compile_flag_if_supported(-Werror=tautological-undefined-compare) add_compile_flag_if_supported(-Werror=implicit-fallthrough) # Use Q_FALLTHROUGH for false positives. if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_flag_if_supported(-Wdocumentation) add_compile_flag_if_supported(-Wcovered-switch-default) add_compile_flag_if_supported(-Wunreachable-code-break) # This warning is triggered by every call to qCDebug() add_compile_flag_if_supported(-Wno-gnu-zero-variadic-macro-arguments) endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_flag_if_supported(-pedantic) add_compile_flag_if_supported(-Wzero-as-null-pointer-constant CXX_ONLY) endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_compile_flag_if_supported(-Wsuggest-override CXX_ONLY) endif() 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() # create config-kdevelop.h configure_file(config-kdevelop.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kdevelop.h) include_directories(${KDevelop_BINARY_DIR}) # for config-kdevelop.h add_subdirectory(kdevplatform) add_subdirectory(plugins) add_subdirectory(pics) add_subdirectory(app) add_subdirectory(app_templates) add_subdirectory(file_templates) add_subdirectory(shortcuts) add_subdirectory(doc) add_subdirectory(share) set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KDevelop") configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KDevelopConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KDevelopConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} ) ecm_setup_version(${KDevelop_VERSION_MAJOR}.${KDevelop_VERSION_MINOR}.${KDevelop_VERSION_PATCH} VARIABLE_PREFIX KDEVELOP VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdevelop_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDevelopConfigVersion.cmake" ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/kdevelop_version.h" DESTINATION "${KDE_INSTALL_INCLUDEDIR}/kdevelop") install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KDevelopConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KDevelopConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" ) install(EXPORT KDevelopTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" NAMESPACE KDev:: FILE KDevelopTargets.cmake) # kdebugsettings file install_qt_logging_categories(TYPE APP_PLUGIN) # CTestCustom.cmake has to be in the CTEST_BINARY_DIR. # in the KDE build system, this is the same as CMAKE_BINARY_DIR. configure_file(${CMAKE_SOURCE_DIR}/CTestCustom.cmake ${CMAKE_BINARY_DIR}/CTestCustom.cmake) install(FILES org.kde.kdevelop.appdata.xml DESTINATION ${KDE_INSTALL_METAINFODIR}) # Make it possible to use the po files fetched by the fetch-translations step ki18n_install(po) feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --git a/plugins/qmakemanager/CMakeLists.txt b/plugins/qmakemanager/CMakeLists.txt index 87fd9000e6..688526dc23 100644 --- a/plugins/qmakemanager/CMakeLists.txt +++ b/plugins/qmakemanager/CMakeLists.txt @@ -1,49 +1,52 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kdevqmakemanager\") +remove_definitions( + -DQT_NO_FOREACH +) declare_qt_logging_category(qmakecommon_LOG_SRCS TYPE PLUGIN IDENTIFIER KDEV_QMAKE CATEGORY_BASENAME "qmake" ) add_subdirectory(parser) if(BUILD_TESTING) add_subdirectory(tests) endif() set(qmakecommon_SRCS qmakebuilddirchooser.cpp qmakebuilddirchooserdialog.cpp qmakecache.cpp qmakeconfig.cpp qmakefile.cpp qmakefilevisitor.cpp qmakeincludefile.cpp qmakemkspecs.cpp qmakeprojectfile.cpp qmakeutils.cpp variablereferenceparser.cpp ${qmakecommon_LOG_SRCS} ) ki18n_wrap_ui(qmakecommon_SRCS qmakebuilddirchooser.ui) add_library(kdevqmakecommon STATIC ${qmakecommon_SRCS}) target_link_libraries(kdevqmakecommon KDev::Interfaces KDev::Project KDev::Util kdevqmakeparser) set(kdevqmakemanager_PART_SRCS qmakemanager.cpp qmakemodelitems.cpp qmakejob.cpp ) kdevplatform_add_plugin(kdevqmakemanager JSON kdevqmakemanager.json SOURCES ${kdevqmakemanager_PART_SRCS}) target_link_libraries(kdevqmakemanager KDev::Interfaces KDev::Project KDev::Util KDev::OutputView KDev::Serialization KDev::QMakeBuilder kdevqmakecommon kdevqmakeparser ) diff --git a/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt b/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt index 97126ba517..17cbe9f783 100644 --- a/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt +++ b/plugins/qmljs/3rdparty/qtcreator-libs/CMakeLists.txt @@ -1,94 +1,95 @@ remove_definitions( -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_BYTEARRAY + -DQT_NO_FOREACH ) qt5_wrap_ui(uifiles_SRCS utils/projectintropage.ui utils/filewizardpage.ui utils/newclasswidget.ui ) add_library(kdevqtc-qmlsupport STATIC ${uifiles_SRCS} languageutils/componentversion.cpp languageutils/fakemetaobject.cpp qmljs/parser/qmldirparser.cpp qmljs/parser/qmlerror.cpp qmljs/parser/qmljsast.cpp qmljs/parser/qmljsastvisitor.cpp qmljs/parser/qmljsengine_p.cpp qmljs/parser/qmljsgrammar.cpp qmljs/parser/qmljslexer.cpp qmljs/parser/qmljsparser.cpp qmljs/qmljsdocument.cpp qmljs/qmljsutils.cpp utils/changeset.cpp utils/fileutils.cpp utils/qtcassert.cpp utils/savefile.cpp utils/json.cpp utils/filesystemwatcher.cpp utils/environment.cpp utils/hostosinfo.cpp utils/runextensions.cpp qmljs/persistenttrie.cpp qmljs/qmljsbind.cpp qmljs/qmljsbundle.cpp qmljs/qmljscontext.cpp qmljs/qmljsdialect.cpp qmljs/qmljsevaluate.cpp qmljs/qmljsimportdependencies.cpp qmljs/qmljsinterpreter.cpp qmljs/qmljsmodelmanagerinterface.cpp qmljs/qmljsplugindumper.cpp qmljs/qmljsqrcparser.cpp qmljs/qmljsscopeastpath.cpp qmljs/qmljsscopebuilder.cpp qmljs/qmljsscopechain.cpp qmljs/qmljstypedescriptionreader.cpp qmljs/qmljsvalueowner.cpp qmljs/qmljsviewercontext.cpp ) if (APPLE) target_sources(kdevqtc-qmlsupport PRIVATE utils/fileutils_mac.mm) target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE "-framework Foundation" ) endif() # silence warnings which won't be fixed in this 3rd-party code copy, to keep diff small if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-documentation") endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-pedantic") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-implicit-fallthrough") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-overloaded-virtual") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-zero-as-null-pointer-constant") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-deprecated-declarations") endif() if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-suggest-override") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-class-memaccess") add_target_compile_flag_if_supported(kdevqtc-qmlsupport PRIVATE "-Wno-deprecated-copy") endif() target_compile_definitions(kdevqtc-qmlsupport PUBLIC -DLANGUAGEUTILS_LIBRARY -DUTILS_LIBRARY -DQT_CREATOR -DQML_BUILD_STATIC_LIB) # add as SYSTEM include dir so compiler does not emit warnings for the lib headers target_include_directories(kdevqtc-qmlsupport SYSTEM PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) # optional.hpp needs -fexceptions # (otherwise: plugins/qmljs/3rdparty/qtcreator-libs/3rdparty/optional/optional.hpp:561:94: error: exception handling disabled, use -fexceptions to enable) kde_target_enable_exceptions(kdevqtc-qmlsupport PRIVATE) target_link_libraries(kdevqtc-qmlsupport LINK_PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Xml ) set_target_properties(kdevqtc-qmlsupport PROPERTIES CXX_STANDARD 14 CXX_STANDARD_REQUIRED YES ) diff --git a/plugins/qmljs/CMakeLists.txt b/plugins/qmljs/CMakeLists.txt index ba430523d4..a3bcdfb03c 100644 --- a/plugins/qmljs/CMakeLists.txt +++ b/plugins/qmljs/CMakeLists.txt @@ -1,30 +1,34 @@ add_subdirectory(3rdparty/qtcreator-libs) + +remove_definitions( + -DQT_NO_FOREACH +) add_subdirectory(duchain) add_subdirectory(nodejsmodules) if(BUILD_TESTING) add_subdirectory(tests) endif() add_subdirectory(codecompletion) declare_qt_logging_category(kdevqmljslanguagesupport_LOG_SRCS TYPE PLUGIN IDENTIFIER KDEV_QMLJS CATEGORY_BASENAME "qmljs" ) kdevplatform_add_plugin(kdevqmljslanguagesupport JSON kdevqmljs.json SOURCES qmljsparsejob.cpp qmljshighlighting.cpp kdevqmljsplugin.cpp navigation/propertypreviewwidget.cpp ${kdevqmljslanguagesupport_LOG_SRCS} ) target_link_libraries(kdevqmljslanguagesupport kdevqmljsduchain kdevqmljscompletion Qt5::Widgets Qt5::QuickWidgets KF5::Declarative KDev::DefinesAndIncludesManager ) install(DIRECTORY navigation/propertywidgets DESTINATION ${KDE_INSTALL_DATADIR}/kdevqmljssupport)