From f8609e8b64fd9170aa1444ad4e2f6d6d759e9050 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Thu, 11 Sep 2014 21:00:00 +0100 Subject: Fix fallout from recent ECM patches KDE modules cannot assume the normal ECM modules are in the CMake module path, and CMAKE_INSTALL_IMPORTS_INSTALL_DIR / QTQUICKIMPORTSDIR was not set correctly. Also, ECMQueryQmake.cmake used a deprecated CMake command (exec_program). --- tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'tests/KDEInstallDirsTest/vars_defined') diff --git a/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt b/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt index 90d8a94d..ab46cee1 100644 --- a/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt +++ b/tests/KDEInstallDirsTest/vars_defined/CMakeLists.txt @@ -1,7 +1,9 @@ project(KDEInstallDirs.vars_defined) cmake_minimum_required(VERSION 2.8.12) -set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) +set(ECM_KDE_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../kde-modules) +set(ECM_MODULE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../../modules) +set(CMAKE_MODULE_PATH "${ECM_KDE_MODULE_DIR}") include(KDEInstallDirs) set(misc_vars -- cgit v1.2.1