From afd4bce57e3333018d6b14347aaac1267bb35e65 Mon Sep 17 00:00:00 2001 From: Ben Cooksley Date: Mon, 22 Jan 2018 22:29:11 +1300 Subject: [PATCH] Append to CMAKE_MODULE_PATH instead of fully overwriting it. If we fully overwrite the path, then other directories which may have been provided via CMAKE_PREFIX_PATH don't get searched. This causes breakages on the Windows CI as CMake, QCA and ECM are all installed in different prefixes. The existing code will capture items 1 and 3 here, meaning QCA won't be found. This problem doesn't show up on FreeBSD and Linux as CMake and QCA are in the same install prefix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c87920d84..a66c230b8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,7 @@ set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}. cmake_minimum_required(VERSION 2.8.12) find_package(ECM 0.0.9 REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) +list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) find_package(Qt5 5.2 REQUIRED COMPONENTS Quick)