From d2170f13c04e13e392ae780ee28b60ddebb20c9a Mon Sep 17 00:00:00 2001
From: Johnny Jazeix <jazeix@gmail.com>
Date: Fri, 3 Jan 2020 19:41:26 +0100
Subject: [PATCH] revert previous commit, add KDECompilerSettings back

---
 CMakeLists.txt       |  2 +-
 app/FakeTarget.cmake | 24 +++++++++++-------------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 741f48189..b68c91de4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ include(CMakePackageConfigHelpers)
 include(ECMOptionalAddSubdirectory)
 include(ECMQtDeclareLoggingCategory)
 include(KDECMakeSettings)
-#include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
 include(KDEInstallDirs)
 include(KDEPackageAppTemplates)
 include(WriteBasicConfigVersionFile)
diff --git a/app/FakeTarget.cmake b/app/FakeTarget.cmake
index 96acf5a9d..ebb82ee3d 100644
--- a/app/FakeTarget.cmake
+++ b/app/FakeTarget.cmake
@@ -10,21 +10,19 @@ add_custom_target(fake-target
     SOURCES ${QML_SRCS})
 
 # qmllint: qml static syntax checker
-if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
-    if(NOT DEFINED ECM_ENABLE_SANITIZERS)
-        find_program(QMLLINT qmllint)
-        if(EXISTS "${QMLLINT}")
-            message("-- Found qmllint: ${QMLLINT}")
-            add_custom_command(TARGET latte-dock PRE_BUILD
-                COMMAND ${QMLLINT} ${QML_SRCS}
-                WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                COMMENT "Running qmllint")
-        else()
-            message("-- qmllint: QML Syntax verifier not found")
-        endif()
+if(${CMAKE_BUILD_TYPE} MATCHES "Debug" AND NOT DEFINED ECM_ENABLE_SANITIZERS)
+    find_program(QMLLINT qmllint)
+
+    if(EXISTS "${QMLLINT}")
+        message("-- Found qmllint: ${QMLLINT}")
+        add_custom_command(TARGET latte-dock PRE_BUILD
+            COMMAND ${QMLLINT} ${QML_SRCS}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+            COMMENT "Running qmllint")
     else()
-        message("-- Disable qmllint because ECM_ENABLE_SANITIZERS is defined")
+        message("-- qmllint: QML Syntax verifier not found")
     endif()
+
     message("-- Enabling QML debugging and profiling")
     add_definitions(-DQT_QML_DEBUG)
     add_definitions(-DQT_FATAL_WARNINGS)