tristan/kdeconnect-kde
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Append to CMAKE_MODULE_PATH instead of fully overwriting it.

Browse source 
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
This commit is contained in:
Ben Cooksley 2018-01-22 22:29:11 +13:00
parent 8795aaee41
commit afd4bce57e
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -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)