From dd2463a9e1b13ae71b7bf5b9fb14ca500a2ebc22 Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Tue, 12 Dec 2006 14:25:21 +0000 Subject: [PATCH] port patch from branch: get rid of Qt3Support dependency svn path=/trunk/KDE/kdebase/workspace/; revision=612754 --- data/CMakeLists.txt | 38 ++++---------------------------------- 1 file changed, 4 insertions(+), 34 deletions(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 9a48df8944..21ea07cd55 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,26 +4,26 @@ ########### next target ############### set(kwin_update_window_settings_SRCS update_window_settings.cpp) -kde4_automoc(kwin_update_window_settings ${kwin_update_window_settings_SRCS}) +kde4_automoc(${kwin_update_window_settings_SRCS}) kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS}) target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS}) -install_targets(/lib/kconf_update_bin/ kwin_update_window_settings ) +install(TARGETS kwin_update_window_settings DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ ) ########### next target ############### set(kwin_update_default_rules_SRCS update_default_rules.cpp) -kde4_automoc(kwin_update_default_rules ${kwin_update_default_rules}) +kde4_automoc(${kwin_update_default_rules}) kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS}) target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} ) -install_targets(/lib/kconf_update_bin/ kwin_update_default_rules ) +install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ ) ########### install files ############### @@ -33,33 +33,3 @@ install( FILES pop.wav DESTINATION ${SOUND_INSTALL_DIR} ) install( FILES kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install(PROGRAMS pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) - - - -#original Makefile.am contents follow: - -#kconf_PROGRAMS = kwin_update_window_settings kwin_update_default_rules -#kconfdir = $(libdir)/kconf_update_bin -# -#kwin_update_window_settings_SOURCES = update_window_settings.cpp -#kwin_update_window_settings_LDADD = $(LIB_KDECORE) $(KDE_RPATH) -#kwin_update_window_settings_LDFLAGS = $(all_libraries) -# -#kwin_update_default_rules_SOURCES = update_default_rules.cpp -#kwin_update_default_rules_LDADD = $(LIB_KDECORE) $(KDE_RPATH) -#kwin_update_default_rules_LDFLAGS = $(all_libraries) -# -#INCLUDES = $(all_includes) -# -#METASOURCES = AUTO -# -#sounddir= $(kde_sounddir) -#sound_DATA = pop.wav -# -#update_DATA = kwin.upd kwinsticky.upd kwiniconify.upd kwin3_plugin.upd kwin_focus1.upd \ -# kwinupdatewindowsettings.upd kwin_focus2.upd kwin_fsp_workarounds_1.upd -#update_SCRIPTS = pluginlibFix.pl kwin3_plugin.pl kwin_focus1.sh kwin_focus2.sh -#updatedir = $(kde_datadir)/kconf_update -# -#kwin_default_rules_DATA = fsp_workarounds_1 -#kwin_default_rulesdir = $(kde_datadir)/kwin/default_rules