From 392fa639b65f7cddaf6b8107abc285ccfc48a9ea Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Mon, 11 Nov 2013 18:29:00 +0100 Subject: [PATCH] Only include QCA includes where needed There's no need to make all the framework look for the QCA includes while they're only being used by the remote part. It could possibly be made more specific, but I don't think those are yet being used anyway. --- CMakeLists.txt | 6 ------ src/plasma/CMakeLists.txt | 5 +++++ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db3ead906..c22acfa73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,12 +126,6 @@ add_definitions(-DQT_NO_URL_CAST_FROM_STRING) remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY -DQT_NO_KEYWORDS) -if(QCA2_FOUND) -# include_directories( -# ${QCA2_INCLUDE_DIR} -# ) -endif() - include(PlasmaMacros.cmake) ################# configure checks and create the configured files ################# diff --git a/src/plasma/CMakeLists.txt b/src/plasma/CMakeLists.txt index c480663f1..a3d1c0cca 100644 --- a/src/plasma/CMakeLists.txt +++ b/src/plasma/CMakeLists.txt @@ -1,3 +1,8 @@ +if(QCA2_FOUND) + include_directories( + ${QCA2_INCLUDE_DIR} + ) +endif() # This option should be removed, or moved down as far as possible. # That means porting the existing frameworks to the CMake automoc