Blame 0007-Fix-building-apps-that-use-kscreen-and-which-fail-wi.patch
|
Rex Dieter |
3cbeae5 |
From 76aba9ff19cf10f7e8fbf6753235bbb47cd2d295 Mon Sep 17 00:00:00 2001
|
|
Rex Dieter |
3cbeae5 |
From: David Faure <faure@kde.org>
|
|
Rex Dieter |
3cbeae5 |
Date: Mon, 27 Jul 2015 09:46:16 +0200
|
|
Rex Dieter |
3cbeae5 |
Subject: [PATCH 7/7] Fix building apps that use kscreen and which fail with
|
|
Rex Dieter |
3cbeae5 |
"-lqjson not found"
|
|
Rex Dieter |
3cbeae5 |
|
|
Rex Dieter |
3cbeae5 |
when CMP0003 is NEW.
|
|
Rex Dieter |
3cbeae5 |
This is because qjson's target name doesn't contain "::" so cmake doesn't
|
|
Rex Dieter |
3cbeae5 |
magically look for it as a target, it assumes it's a library.
|
|
Rex Dieter |
3cbeae5 |
|
|
Rex Dieter |
3cbeae5 |
Reviewed by Alex Merry.
|
|
Rex Dieter |
3cbeae5 |
---
|
|
Rex Dieter |
3cbeae5 |
LibKScreenConfig.cmake.in | 3 +++
|
|
Rex Dieter |
3cbeae5 |
1 file changed, 3 insertions(+)
|
|
Rex Dieter |
3cbeae5 |
|
|
Rex Dieter |
3cbeae5 |
diff --git a/LibKScreenConfig.cmake.in b/LibKScreenConfig.cmake.in
|
|
Rex Dieter |
3cbeae5 |
index 45e4fad..4b77f1f 100644
|
|
Rex Dieter |
3cbeae5 |
--- a/LibKScreenConfig.cmake.in
|
|
Rex Dieter |
3cbeae5 |
+++ b/LibKScreenConfig.cmake.in
|
|
Rex Dieter |
3cbeae5 |
@@ -5,6 +5,9 @@
|
|
Rex Dieter |
3cbeae5 |
# LibKScreen_LIBRARY - The library needed to use LibKScreen
|
|
Rex Dieter |
3cbeae5 |
# LibKScreen_VERSION - The LibKScreen version
|
|
Rex Dieter |
3cbeae5 |
|
|
Rex Dieter |
3cbeae5 |
+# qjson's target name doesn't contain "::", so look for it explicitly
|
|
Rex Dieter |
3cbeae5 |
+find_package(QJSON REQUIRED)
|
|
Rex Dieter |
3cbeae5 |
+
|
|
Rex Dieter |
3cbeae5 |
get_filename_component(_currentDir ${CMAKE_CURRENT_LIST_FILE} PATH) # The current directory
|
|
Rex Dieter |
3cbeae5 |
get_filename_component(rootDir ${_currentDir}/@relInstallDir@ ABSOLUTE) # The install prefix
|
|
Rex Dieter |
3cbeae5 |
|
|
Rex Dieter |
3cbeae5 |
--
|
|
Rex Dieter |
3cbeae5 |
2.5.0
|
|
Rex Dieter |
3cbeae5 |
|