From 3e1acd0b42437b5faa6b4be1057b4912d2abdfb4 Mon Sep 17 00:00:00 2001 From: David Faure Date: Wed, 16 Nov 2011 13:45:44 +0100 Subject: [PATCH] Resolve conflicts --- CMakeLists.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fe680ec05..93a31470b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,17 +49,15 @@ if(NOT PLASMA_NO_SOLID) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS}) endif(NOT PLASMA_NO_SOLID) -<<<<<<< HEAD if(NOT PLASMA_NO_PACKAGEKIT) add_definitions(-DPLASMA_ENABLE_PACKAGEKIT_SUPPORT=1) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${QT_QTDBUS_LIBRARY}) endif(NOT PLASMA_NO_PACKAGEKIT) -======= + if (NOT PLASMA_NO_KUTILS) include_directories(${CMAKE_SOURCE_DIR}/kutils) set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS}) endif(NOT PLASMA_NO_KUTILS) ->>>>>>> origin/KDE/4.7 if(QCA2_FOUND) include_directories(${QCA2_INCLUDE_DIR})