diff --git a/CMakeLists.txt b/CMakeLists.txt
index 099177c..19ba8ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,67 +1,55 @@
-
 cmake_minimum_required(VERSION 3.0)
 
 project(wacomtablet)
 
 set(QT_MIN_VERSION "5.3.0")
 find_package(ECM 1.6.0 REQUIRED CONFIG)
-set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake/modules)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
-include(KDECompilerSettings)
+include(KDECompilerSettings NO_POLICY_SCOPE)
 include(FeatureSummary)
 include(ECMOptionalAddSubdirectory)
 include(ECMInstallIcons)
 
-find_package(ECM REQUIRED NOCOMPONENTS)
 find_package(Qt5 REQUIRED COMPONENTS Core Gui Widgets DBus X11Extras Qml)
 find_package(KF5 REQUIRED COMPONENTS CoreAddons I18n GlobalAccel Config XmlGui WidgetsAddons WindowSystem Notifications DBusAddons Plasma DocTools)
 find_package(XCB REQUIRED COMPONENTS RANDR OPTIONAL_COMPONENTS XINPUT)
 find_package(X11 REQUIRED COMPONENTS XLIB RANDR)
-
+find_package(XorgWacom REQUIRED)
 
 # xcb-xinput is an experimental API and is not built by default in the xcb
 # repository. Downstream distributions without xcb-xinput, such as Kubuntu, can
 # build using the Xlib version of the library instead.
 #
 # Because Qt5 uses xcb exclusively for native event handling, kded is unable
 # to monitor hotplugging events, since these are signaled as xinput events.
 #
 # Users can enable xcb-xinput by building xcb with the configuration flag --enable-xinput.
 if(XCB_XINPUT_FOUND)
     message(STATUS "Using XCB_XINPUT.  Please note this is an unstable API.")
     set(USING_X_LIBRARIES XCB::XINPUT XCB::RANDR ${X11_Xrandr_LIB} ${X11_Xinput_LIB})
     add_definitions(-DHAVE_XCB_XINPUT)
 else()
     message(STATUS "Falling back to X11_XINPUT.  (Daemon will be unable to monitor hotplugging.)")
     set(USING_X_LIBRARIES XCB::RANDR ${X11_LIBRARIES} ${X11_Xinput_LIB} ${X11_Xrandr_LIB})
 endif()
 
-
-
-# local cmake modules
-set(CMAKE_MODULE_PATH
-    ${CMAKE_MODULE_PATH}
-    ${CMAKE_SOURCE_DIR}/cmake/modules
-)
-
-find_package(XorgWacom REQUIRED)
-
 add_definitions( -DQT_STRICT_ITERATORS )
 add_definitions( -DQT_NO_CAST_FROM_ASCII )
 add_definitions( -DQT_NO_CAST_TO_ASCII )
 add_definitions( -DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS )
 
 add_subdirectory( src )
 add_subdirectory( data )
 add_subdirectory( images )
 add_subdirectory( doc )
 
 ### Tests
 if(BUILD_TESTING)
   find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
   add_subdirectory( autotests )
 endif()
 
 
 feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)