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/not_cache_variable/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/KDEInstallDirsTest/not_cache_variable') diff --git a/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt b/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt index 6162e070..ea62d95b 100644 --- a/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt +++ b/tests/KDEInstallDirsTest/not_cache_variable/CMakeLists.txt @@ -1,10 +1,12 @@ # Test KDEInstallDirs does not crash if a variable like CMAKE_INSTALL_LIBDIR is # defined but is not a cache variable. cmake_minimum_required(VERSION 2.8) -set(kde_modules_dir ${CMAKE_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_INSTALL_LIBDIR "foo") -include(${kde_modules_dir}/KDEInstallDirs.cmake) +include(${ECM_KDE_MODULE_DIR}/KDEInstallDirs.cmake) add_executable(dummy main.c) set_target_properties(dummy PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) -- cgit v1.2.1