From 73ce957badb26eddb15868ef9d2e578192ee790f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lubo=C5=A1=20Lu=C5=88=C3=A1k?= Date: Sun, 29 Apr 2007 20:55:58 +0000 Subject: [PATCH] Merging from old trunk: r565833 | winterz | 2006-07-24 18:02:07 +0200 (Mon, 24 Jul 2006) | 2 lines use library variables, where possible. svn path=/trunk/KDE/kdebase/workspace/; revision=659261 --- clients/b2/CMakeLists.txt | 8 +++----- clients/default/CMakeLists.txt | 8 +++----- clients/laptop/CMakeLists.txt | 8 +++----- clients/modernsystem/CMakeLists.txt | 8 +++----- clients/redmond/CMakeLists.txt | 8 +++----- 5 files changed, 15 insertions(+), 25 deletions(-) diff --git a/clients/b2/CMakeLists.txt b/clients/b2/CMakeLists.txt index a9ce8e5882..bb8e072112 100644 --- a/clients/b2/CMakeLists.txt +++ b/clients/b2/CMakeLists.txt @@ -6,17 +6,15 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_b2_PART_SRCS b2client.cpp ) +set(kwin3_b2_PART_SRCS b2client.cpp) kde4_automoc(kwin3_b2 ${kwin3_b2_PART_SRCS}) kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS}) -kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_b2 ) +target_link_libraries(kwin3_b2 ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY}) -target_link_libraries(kwin3_b2 ${KDE4_KDEUI_LIBS} kdecorations kdefx ${QT_QT3SUPPORT_LIBRARY} ${X11_LIBRARIES} ${QT_QTGUI_LIBRARY}) - -install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### diff --git a/clients/default/CMakeLists.txt b/clients/default/CMakeLists.txt index 93d8e4d412..f606d48b2c 100644 --- a/clients/default/CMakeLists.txt +++ b/clients/default/CMakeLists.txt @@ -5,15 +5,13 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_default_PART_SRCS kdedefault.cpp ) +set(kwin3_default_PART_SRCS kdedefault.cpp) kde4_automoc(kwin3_default ${kwin3_default_PART_SRCS}) kde4_add_plugin(kwin3_default ${kwin3_default_PART_SRCS}) +target_link_libraries(kwin3_default ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY}) - -target_link_libraries(kwin3_default ${KDE4_KDECORE_LIBS} kdefx kdecorations ${QT_QTGUI_LIBRARY}) - -install(TARGETS kwin3_default DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kwin3_default DESTINATION ${PLUGIN_INSTALL_DIR}) diff --git a/clients/laptop/CMakeLists.txt b/clients/laptop/CMakeLists.txt index 3320b4fcd8..959e9de9ab 100644 --- a/clients/laptop/CMakeLists.txt +++ b/clients/laptop/CMakeLists.txt @@ -4,17 +4,15 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_laptop_PART_SRCS laptopclient.cpp ) +set(kwin3_laptop_PART_SRCS laptopclient.cpp) kde4_automoc(kwin3_laptop ${kwin3_laptop_PART_SRCS}) kde4_add_plugin(kwin3_laptop ${kwin3_laptop_PART_SRCS}) +target_link_libraries(kwin3_laptop ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations) - -target_link_libraries(kwin3_laptop ${KDE4_KDECORE_LIBS} kdecorations kdefx ) - -install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### diff --git a/clients/modernsystem/CMakeLists.txt b/clients/modernsystem/CMakeLists.txt index 40cd208d05..fdff7ed90d 100644 --- a/clients/modernsystem/CMakeLists.txt +++ b/clients/modernsystem/CMakeLists.txt @@ -6,17 +6,15 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_modernsys_PART_SRCS modernsys.cpp ) +set(kwin3_modernsys_PART_SRCS modernsys.cpp) kde4_automoc(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) kde4_add_plugin(kwin3_modernsys ${kwin3_modernsys_PART_SRCS}) +target_link_libraries(kwin3_modernsys ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations ${QT_QTGUI_LIBRARY}) - -target_link_libraries(kwin3_modernsys ${KDE4_KDECORE_LIBS} kdecorations kdefx ${QT_QTGUI_LIBRARY}) - -install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ############### diff --git a/clients/redmond/CMakeLists.txt b/clients/redmond/CMakeLists.txt index ac58bc6474..d1efda16ee 100644 --- a/clients/redmond/CMakeLists.txt +++ b/clients/redmond/CMakeLists.txt @@ -5,17 +5,15 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ) ########### next target ############### -set(kwin3_redmond_PART_SRCS redmond.cpp ) +set(kwin3_redmond_PART_SRCS redmond.cpp) kde4_automoc(kwin3_redmond ${kwin3_redmond_PART_SRCS}) kde4_add_plugin(kwin3_redmond ${kwin3_redmond_PART_SRCS}) +target_link_libraries(kwin3_redmond ${KDE4_KDECORE_LIBS} ${KDE4_KDEFX_LIBS} kdecorations) - -target_link_libraries(kwin3_redmond ${KDE4_KDECORE_LIBS} kdefx kdecorations ) - -install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR} ) +install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR}) ########### install files ###############