newer kf5 doesn't use CONFIG
ECM needs to be used before find_package
Reset changes on root CMakeLists.txt to reduce delta with upstream