From 942f57109482b092f729033b053c87596310cee8 Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Thu, 28 Jan 2016 14:56:45 +0100 Subject: [PATCH] Let KDE*CompilerSettings change the policies in the project As suggested in ECM documentation. --- CMakeLists.txt | 4 ++-- templates/cpp-plasmoid/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6da36d29c..e8db8febb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,10 +14,10 @@ include(GenerateExportHeader) include(ECMGenerateHeaders) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMPackageConfigHelpers) include(ECMSetupVersion) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) include(KDEPackageAppTemplates) diff --git a/templates/cpp-plasmoid/CMakeLists.txt b/templates/cpp-plasmoid/CMakeLists.txt index a52c22e12..c6881d4e4 100644 --- a/templates/cpp-plasmoid/CMakeLists.txt +++ b/templates/cpp-plasmoid/CMakeLists.txt @@ -7,7 +7,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDECompilerSettings) +include(KDECompilerSettings NO_POLICY_SCOPE) include(ECMInstallIcons) include(ECMMarkAsTest) include(ECMMarkNonGuiExecutable)