Resolve conflicts
This commit is contained in:
parent
7f2b0b44c0
commit
3e1acd0b42
@ -49,17 +49,15 @@ if(NOT PLASMA_NO_SOLID)
|
|||||||
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
|
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_SOLID_LIBS})
|
||||||
endif(NOT PLASMA_NO_SOLID)
|
endif(NOT PLASMA_NO_SOLID)
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
if(NOT PLASMA_NO_PACKAGEKIT)
|
if(NOT PLASMA_NO_PACKAGEKIT)
|
||||||
add_definitions(-DPLASMA_ENABLE_PACKAGEKIT_SUPPORT=1)
|
add_definitions(-DPLASMA_ENABLE_PACKAGEKIT_SUPPORT=1)
|
||||||
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${QT_QTDBUS_LIBRARY})
|
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${QT_QTDBUS_LIBRARY})
|
||||||
endif(NOT PLASMA_NO_PACKAGEKIT)
|
endif(NOT PLASMA_NO_PACKAGEKIT)
|
||||||
=======
|
|
||||||
if (NOT PLASMA_NO_KUTILS)
|
if (NOT PLASMA_NO_KUTILS)
|
||||||
include_directories(${CMAKE_SOURCE_DIR}/kutils)
|
include_directories(${CMAKE_SOURCE_DIR}/kutils)
|
||||||
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS})
|
set(PLASMA_EXTRA_LIBS ${PLASMA_EXTRA_LIBS} ${KDE4_KUTILS_LIBS})
|
||||||
endif(NOT PLASMA_NO_KUTILS)
|
endif(NOT PLASMA_NO_KUTILS)
|
||||||
>>>>>>> origin/KDE/4.7
|
|
||||||
|
|
||||||
if(QCA2_FOUND)
|
if(QCA2_FOUND)
|
||||||
include_directories(${QCA2_INCLUDE_DIR})
|
include_directories(${QCA2_INCLUDE_DIR})
|
||||||
|
Loading…
Reference in New Issue
Block a user