revert previous commit, add KDECompilerSettings back

pull/11/head
Johnny Jazeix 5 years ago
parent e705eed415
commit d2170f13c0

@ -70,7 +70,7 @@ include(CMakePackageConfigHelpers)
include(ECMOptionalAddSubdirectory) include(ECMOptionalAddSubdirectory)
include(ECMQtDeclareLoggingCategory) include(ECMQtDeclareLoggingCategory)
include(KDECMakeSettings) include(KDECMakeSettings)
#include(KDECompilerSettings NO_POLICY_SCOPE) include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDEInstallDirs) include(KDEInstallDirs)
include(KDEPackageAppTemplates) include(KDEPackageAppTemplates)
include(WriteBasicConfigVersionFile) include(WriteBasicConfigVersionFile)

@ -10,21 +10,19 @@ add_custom_target(fake-target
SOURCES ${QML_SRCS}) SOURCES ${QML_SRCS})
# qmllint: qml static syntax checker # qmllint: qml static syntax checker
if(${CMAKE_BUILD_TYPE} MATCHES "Debug") if(${CMAKE_BUILD_TYPE} MATCHES "Debug" AND NOT DEFINED ECM_ENABLE_SANITIZERS)
if(NOT DEFINED ECM_ENABLE_SANITIZERS) find_program(QMLLINT qmllint)
find_program(QMLLINT qmllint)
if(EXISTS "${QMLLINT}") if(EXISTS "${QMLLINT}")
message("-- Found qmllint: ${QMLLINT}") message("-- Found qmllint: ${QMLLINT}")
add_custom_command(TARGET latte-dock PRE_BUILD add_custom_command(TARGET latte-dock PRE_BUILD
COMMAND ${QMLLINT} ${QML_SRCS} COMMAND ${QMLLINT} ${QML_SRCS}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "Running qmllint") COMMENT "Running qmllint")
else()
message("-- qmllint: QML Syntax verifier not found")
endif()
else() else()
message("-- Disable qmllint because ECM_ENABLE_SANITIZERS is defined") message("-- qmllint: QML Syntax verifier not found")
endif() endif()
message("-- Enabling QML debugging and profiling") message("-- Enabling QML debugging and profiling")
add_definitions(-DQT_QML_DEBUG) add_definitions(-DQT_QML_DEBUG)
add_definitions(-DQT_FATAL_WARNINGS) add_definitions(-DQT_FATAL_WARNINGS)

Loading…
Cancel
Save