Commit af506f41 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau

Merge branch '5.4'

parents 2f77fcf7 9bf0a3ef
...@@ -12,7 +12,10 @@ set(KDEV_PLUGIN_VERSION 33) ...@@ -12,7 +12,10 @@ set(KDEV_PLUGIN_VERSION 33)
find_package (ECM 5.28.0 REQUIRED NO_MODULE) find_package (ECM 5.28.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${KDevelop_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) 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(KDECompilerSettings NO_POLICY_SCOPE) # needs to be first, as set policies influence following macros
include(ECMOptionalAddSubdirectory) include(ECMOptionalAddSubdirectory)
include(ECMInstallIcons) include(ECMInstallIcons)
include(ECMAddAppIcon) include(ECMAddAppIcon)
...@@ -28,9 +31,6 @@ include(FeatureSummary) ...@@ -28,9 +31,6 @@ include(FeatureSummary)
include(WriteBasicConfigVersionFile) include(WriteBasicConfigVersionFile)
include(CheckFunctionExists) include(CheckFunctionExists)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDevelopMacrosInternal) include(KDevelopMacrosInternal)
if(POLICY CMP0071) if(POLICY CMP0071)
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<component type="desktop"> <component type="desktop-application">
<id>org.kde.kdevelop.desktop</id> <id>org.kde.kdevelop.desktop</id>
<metadata_license>CC0-1.0</metadata_license> <metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-2.0+</project_license> <project_license>GPL-2.0+</project_license>
......
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