Fix install icons
Fix install lib under x86_64 Fix install include (remove deprecated cmake macro) Cleanup svn path=/branches/work/kwin_composite/; revision=655792
This commit is contained in:
parent
dffec970af
commit
1adecf7737
29 changed files with 40 additions and 494 deletions
|
@ -98,43 +98,3 @@ install( FILES kwin.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
|
|||
install( FILES kwin.notifyrc DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = -I$(srcdir)/lib $(all_includes)
|
||||
#
|
||||
#SUBDIRS = lib . killer kcmkwin pics clients oldheaders data
|
||||
#
|
||||
#bin_PROGRAMS =
|
||||
#lib_LTLIBRARIES =
|
||||
#kdeinit_LTLIBRARIES = kwin.la
|
||||
#
|
||||
#kwin_la_SOURCES = workspace.cpp client.cpp placement.cpp atoms.cpp \
|
||||
# utils.cpp layers.cpp main.cpp popupinfo.cpp tabbox.cpp \
|
||||
# options.cpp plugins.cpp events.cpp KWinInterface.skel \
|
||||
# killwindow.cpp geometrytip.cpp sm.cpp group.cpp bridge.cpp \
|
||||
# manage.cpp notifications.cpp activation.cpp useractions.cpp \
|
||||
# geometry.cpp rules.cpp
|
||||
#
|
||||
#kwin_la_LIBADD = $(LIB_KDEUI) lib/libkdecorations.la
|
||||
#kwin_la_LDFLAGS = $(all_libraries) -module -avoid-version
|
||||
#
|
||||
#include_HEADERS = KWinInterface.h
|
||||
#
|
||||
#KDE_ICON = kwin
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#
|
||||
#messages: rc.cpp
|
||||
# $(XGETTEXT) *.h *.cpp killer/*.cpp lib/*.cpp -o $(podir)/kwin.pot
|
||||
#
|
||||
#kwin_datadir = $(kde_datadir)/kwin
|
||||
#
|
||||
#kwin_data_DATA= eventsrc
|
||||
#
|
||||
#kde_kcfg_DATA = kwin.kcfg
|
||||
#
|
||||
#include ../../admin/Doxyfile.am
|
||||
|
|
|
@ -1,22 +1,25 @@
|
|||
|
||||
add_subdirectory( config )
|
||||
|
||||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
|
||||
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_PART_SRCS})
|
||||
kde4_automoc(kwin3_b2 ${kwin3_b2_PART_SRCS})
|
||||
|
||||
kde4_add_plugin(kwin3_b2 ${kwin3_b2_PART_SRCS})
|
||||
|
||||
target_link_libraries(kwin3_b2 kdecorations)
|
||||
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kwin3_b2 )
|
||||
|
||||
install(TARGETS kwin3_b2 DESTINATION ${PLUGIN_INSTALL_DIR})
|
||||
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 files ###############
|
||||
|
||||
install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
|
|
@ -5,12 +5,14 @@ include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
|
|||
|
||||
set(kwin_b2_config_PART_SRCS config.cpp )
|
||||
|
||||
kde4_automoc(${kwin_b2_config_PART_SRCS})
|
||||
kde4_automoc(kwin_b2_config ${kwin_b2_config_PART_SRCS})
|
||||
|
||||
kde4_add_plugin(kwin_b2_config ${kwin_b2_config_PART_SRCS})
|
||||
|
||||
|
||||
|
||||
target_link_libraries(kwin_b2_config ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} ${QT_QTGUI_LIBRARY})
|
||||
|
||||
install(TARGETS kwin_b2_config DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
|
|
|
@ -17,26 +17,3 @@ target_link_libraries(kwin3_default ${KDE4_KDECORE_LIBS} kdefx kdecorations ${Q
|
|||
|
||||
install(TARGETS kwin3_default DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#SUBDIRS = . config
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_default.la
|
||||
#
|
||||
#kwin3_default_la_SOURCES = kdedefault.cpp
|
||||
#kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_default_la_LIBADD = $(LIB_KDECORE) -lkdefx ../../lib/libkdecorations.la
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = kdedefault.h
|
||||
#
|
||||
|
|
|
@ -15,29 +15,3 @@ target_link_libraries(kwin_default_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY
|
|||
|
||||
install(TARGETS kwin_default_config DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin_default_config.la
|
||||
#
|
||||
#kwin_default_config_la_SOURCES = config.cpp
|
||||
#kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin_default_config_la_LIBADD = $(LIB_KDEUI)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = config.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin/
|
||||
#
|
||||
####KMAKE-start (don't edit or delete this block)
|
||||
#
|
||||
####KMAKE-end
|
||||
|
|
|
@ -24,29 +24,3 @@ install(TARGETS kwin3_keramik DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
########### install files ###############
|
||||
|
||||
install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#SUBDIRS = . config
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_keramik.la
|
||||
#
|
||||
#kwin3_keramik_la_SOURCES = keramik.cpp tiles.qrc
|
||||
#kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_keramik_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
|
||||
##kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_headers = keramik.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin
|
||||
#lnk_DATA = keramik.desktop
|
||||
#
|
||||
#EXTRA_DIST = $(lnk_DATA)
|
||||
#
|
||||
#
|
||||
|
|
|
@ -17,26 +17,3 @@ target_link_libraries(kwin_keramik_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY
|
|||
|
||||
install(TARGETS kwin_keramik_config DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin_keramik_config.la
|
||||
#
|
||||
#kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
|
||||
#kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin_keramik_config_la_LIBADD = $(LIB_KDEUI)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = config.h keramikconfig.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin
|
||||
#
|
||||
|
|
|
@ -23,23 +23,3 @@ install(TARGETS kwin3_kwmtheme DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
|
||||
install( FILES kwmtheme.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#SUBDIRS=cli_installer
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_kwmtheme.la
|
||||
#
|
||||
#kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
|
||||
#kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_kwmtheme_la_LIBADD = -lkdecorations
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = kwmthemeclient.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin
|
||||
#lnk_DATA = kwmtheme.desktop
|
||||
#
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
set(kwmtheme_SRCS main.cpp )
|
||||
|
||||
kde4_automoc(${kwmtheme_SRCS})
|
||||
kde4_automoc(kwmtheme ${kwmtheme_SRCS})
|
||||
|
||||
kde4_add_executable(kwmtheme ${kwmtheme_SRCS})
|
||||
|
||||
|
|
|
@ -21,25 +21,3 @@ install(TARGETS kwin3_laptop DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
|
||||
install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_laptop.la
|
||||
#
|
||||
#kwin3_laptop_la_SOURCES = laptopclient.cpp
|
||||
#kwin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_laptop_la_LIBADD = ../../lib/libkdecorations.la -lkdefx
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = laptopclient.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin
|
||||
#lnk_DATA = laptop.desktop
|
||||
#
|
||||
#EXTRA_DIST = $(lnk_DATA)
|
||||
#
|
||||
|
|
|
@ -23,27 +23,3 @@ install(TARGETS kwin3_modernsys DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
|
||||
install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#SUBDIRS = config
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_modernsys.la
|
||||
#
|
||||
#kwin3_modernsys_la_SOURCES = modernsys.cpp
|
||||
#kwin3_modernsys_la_LIBADD = ../../lib/libkdecorations.la -lkdefx
|
||||
#kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = modernsys.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin/
|
||||
#lnk_DATA = modernsystem.desktop
|
||||
#
|
||||
#EXTRA_DIST = $(lnk_DATA)
|
||||
#
|
||||
|
|
|
@ -15,27 +15,3 @@ target_link_libraries(kwin_modernsys_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRA
|
|||
|
||||
install(TARGETS kwin_modernsys_config DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin_modernsys_config.la
|
||||
#
|
||||
#kwin_modernsys_config_la_SOURCES = config.cpp
|
||||
#kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin_modernsys_config_la_LIBADD = $(LIB_KDEUI)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = config.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin/
|
||||
#
|
||||
|
|
|
@ -27,27 +27,3 @@ install(TARGETS kwin3_plastik DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
|
||||
install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#AUTOMAKE_OPTIONS = foreign
|
||||
#
|
||||
#SUBDIRS = config
|
||||
#
|
||||
#KDE_CXXFLAGS = -DQT_PLUGIN
|
||||
#
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#kwindir = $(kde_datadir)/kwin/
|
||||
#kwin_DATA = plastik.desktop
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_plastik.la
|
||||
#kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
|
||||
#kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_plastik_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
|
||||
#kwin3_plastik_la_METASOURCES = AUTO
|
||||
#
|
||||
#DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES)
|
||||
#
|
||||
|
|
|
@ -17,27 +17,3 @@ target_link_libraries(kwin_plastik_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY
|
|||
|
||||
install(TARGETS kwin_plastik_config DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin_plastik_config.la
|
||||
#
|
||||
#kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui
|
||||
#kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin_plastik_config_la_LIBADD = $(LIB_KDEUI)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = config.h
|
||||
#DISTCLEANFILES = $(METASOURCES)
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin
|
||||
#
|
||||
|
|
|
@ -24,30 +24,3 @@ install(TARGETS kwin3_quartz DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#SUBDIRS = . config
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_quartz.la
|
||||
#
|
||||
#kwin3_quartz_la_SOURCES = quartz.cpp
|
||||
#kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_quartz_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = quartz.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin/
|
||||
#lnk_DATA = quartz.desktop
|
||||
#
|
||||
#EXTRA_DIST = $(lnk_DATA)
|
||||
#
|
||||
#
|
||||
####KMAKE-start (don't edit or delete this block)
|
||||
#
|
||||
####KMAKE-end
|
||||
|
|
|
@ -15,29 +15,3 @@ target_link_libraries(kwin_quartz_config ${KDE4_KDEUI_LIBS} ${QT_QTGUI_LIBRARY}
|
|||
|
||||
install(TARGETS kwin_quartz_config DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin_quartz_config.la
|
||||
#
|
||||
#kwin_quartz_config_la_SOURCES = config.cpp
|
||||
#kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin_quartz_config_la_LIBADD = $(LIB_KDEUI)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = config.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin/
|
||||
#
|
||||
####KMAKE-start (don't edit or delete this block)
|
||||
#
|
||||
####KMAKE-end
|
||||
|
|
|
@ -21,26 +21,3 @@ install(TARGETS kwin3_redmond DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
########### install files ###############
|
||||
|
||||
install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_redmond.la
|
||||
#
|
||||
#kwin3_redmond_la_SOURCES = redmond.cpp
|
||||
#kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_redmond_la_LIBADD = $(LIB_KDECORE) -lkdefx ../../lib/libkdecorations.la
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#noinst_HEADERS = redmond.h
|
||||
#
|
||||
#lnkdir = $(kde_datadir)/kwin
|
||||
#lnk_DATA = redmond.desktop
|
||||
#
|
||||
#EXTRA_DIST = $(lnk_DATA)
|
||||
#
|
||||
|
|
|
@ -20,24 +20,3 @@ install(TARGETS kwin3_test DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
########### install files ###############
|
||||
|
||||
install( FILES test.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kwin3_test.la
|
||||
#
|
||||
#kwin3_test_la_SOURCES = test.cpp
|
||||
#kwin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_test_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
|
||||
##kwin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#
|
||||
#kwin_test_lnkdir = $(kde_datadir)/kwin
|
||||
#kwin_test_lnk_DATA = test.desktop
|
||||
#
|
||||
#EXTRA_DIST = $(kwin_test_lnk_DATA)
|
||||
|
|
|
@ -21,23 +21,3 @@ install(TARGETS kwin3_web DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
|
||||
install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin/ )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = -I$(top_srcdir) $(all_includes)
|
||||
#kde_module_LTLIBRARIES = kwin3_web.la
|
||||
#
|
||||
#kwin3_web_la_SOURCES = Web.cpp WebButton.cpp
|
||||
#
|
||||
#noinst_HEADERS = Web.h WebButton.h
|
||||
#
|
||||
#kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
|
||||
#kwin3_web_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
|
||||
#METASOURCES = AUTO
|
||||
#
|
||||
#linkdir = $(kde_datadir)/kwin/
|
||||
#link_DATA = web.desktop
|
||||
#EXTRA_DIST = $(link_DATA)
|
||||
#
|
||||
|
|
|
@ -1,12 +1,10 @@
|
|||
|
||||
set(kwin_xml ${CMAKE_SOURCE_DIR}/workspace/kwin/org.kde.KWin.xml)
|
||||
|
||||
|
||||
########### next target ###############
|
||||
set(kwin_update_window_settings_SRCS update_window_settings.cpp )
|
||||
set(kwin_update_window_settings_SRCS update_window_settings.cpp)
|
||||
|
||||
|
||||
kde4_automoc(${kwin_update_window_settings_SRCS})
|
||||
kde4_automoc(kwin_update_window_settings ${kwin_update_window_settings_SRCS})
|
||||
|
||||
kde4_add_executable( kwin_update_window_settings ${kwin_update_window_settings_SRCS})
|
||||
|
||||
|
@ -15,11 +13,10 @@ target_link_libraries( kwin_update_window_settings ${KDE4_KDECORE_LIBS})
|
|||
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})
|
||||
kde4_automoc(kwin_update_default_rules ${kwin_update_default_rules})
|
||||
|
||||
kde4_add_executable( kwin_update_default_rules ${kwin_update_default_rules_SRCS})
|
||||
|
||||
|
@ -27,7 +24,6 @@ target_link_libraries( kwin_update_default_rules ${KDE4_KDECORE_LIBS} )
|
|||
|
||||
install(TARGETS kwin_update_default_rules DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin/ )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES fsp_workarounds_1 DESTINATION ${DATA_INSTALL_DIR}/kwin/default_rules )
|
||||
|
|
|
@ -2,3 +2,4 @@
|
|||
add_subdirectory( kwinoptions )
|
||||
add_subdirectory( kwindecoration )
|
||||
add_subdirectory( kwinrules )
|
||||
|
||||
|
|
|
@ -22,25 +22,3 @@ install(TARGETS kcm_kwindecoration DESTINATION ${PLUGIN_INSTALL_DIR} )
|
|||
install( FILES kwindecoration.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#INCLUDES = -I$(srcdir)/../../lib $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kcm_kwindecoration.la
|
||||
#
|
||||
#kcm_kwindecoration_la_SOURCES = kwindecoration.cpp buttons.cpp kwindecorationIface.skel preview.cpp
|
||||
#noinst_HEADERS = kwindecoration.h kwindecorationIface.h buttons.h preview.h
|
||||
#
|
||||
#kcm_kwindecoration_la_LDFLAGS = \
|
||||
# -module -avoid-version $(all_libraries) -no-undefined
|
||||
#
|
||||
#kcm_kwindecoration_la_LIBADD = $(LIB_KDEUI) ../../lib/libkdecorations.la
|
||||
#
|
||||
#METASOURCES = AUTO
|
||||
#
|
||||
#messages:
|
||||
# $(XGETTEXT) *.cpp -o $(podir)/kcmkwindecoration.pot
|
||||
#
|
||||
#xdg_apps_DATA = kwindecoration.desktop
|
||||
|
|
|
@ -22,29 +22,4 @@ install( FILES kwinoptions.desktop kwinactions.desktop kwinadvanced.desktop
|
|||
kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop
|
||||
DESTINATION ${SERVICES_INSTALL_DIR})
|
||||
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} crystalsvg )
|
||||
|
||||
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
#METASOURCES = AUTO
|
||||
#INCLUDES = $(all_includes)
|
||||
#
|
||||
#kde_module_LTLIBRARIES = kcm_kwinoptions.la
|
||||
#
|
||||
#kcm_kwinoptions_la_SOURCES = windows.cpp mouse.cpp main.cpp
|
||||
#kcm_kwinoptions_la_LDFLAGS = -module -avoid-version $(all_libraries) -no-undefined
|
||||
#kcm_kwinoptions_la_LIBADD = $(LIB_KDEUI)
|
||||
#
|
||||
#noinst_HEADERS = windows.h mouse.h
|
||||
#
|
||||
#messages:
|
||||
# $(XGETTEXT) *.cpp -o $(podir)/kcmkwm.pot
|
||||
#
|
||||
#kwin_kcmkwin_options_data_DATA = kwinactions.desktop kwinadvanced.desktop kwinfocus.desktop kwinmoving.desktop kwintranslucency.desktop
|
||||
#kwin_kcmkwin_options_datadir = $(kde_appsdir)/.hidden
|
||||
#
|
||||
#xdg_apps_DATA = kwinoptions.desktop
|
||||
#KDE_ICON=AUTO
|
||||
kde4_install_icons( ${ICON_INSTALL_DIR} )
|
||||
|
|
|
@ -1,40 +1,46 @@
|
|||
include_directories( ${CMAKE_SOURCE_DIR}/workspace/kwin/lib ${CMAKE_SOURCE_DIR}/workspace/kwin/lib )
|
||||
include_directories(
|
||||
${CMAKE_SOURCE_DIR}/workspace/kwin/lib
|
||||
${CMAKE_SOURCE_DIR}/workspace/kwin/lib
|
||||
${CMAKE_BINARY_DIR}/workspace/kwin
|
||||
)
|
||||
|
||||
ADD_DEFINITIONS(-DKCMRULES)
|
||||
########### next target ###############
|
||||
|
||||
set(kwinrules_SRCS ruleswidget.cpp ruleslist.cpp kwinsrc.cpp detectwidget.cpp)
|
||||
|
||||
kde4_add_ui_files(kwinrules_SRCS ruleslistbase.ui detectwidgetbase.ui)
|
||||
kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui editshortcutbase.ui )
|
||||
kde4_add_ui3_files(kwinrules_SRCS ruleswidgetbase.ui ruleslistbase.ui detectwidgetbase.ui editshortcutbase.ui )
|
||||
|
||||
set(kwin_rules_dialog_KDEINIT_SRCS main.cpp ${kwinrules_SRCS})
|
||||
|
||||
kde4_automoc(${kwin_rules_dialog_KDEINIT_SRCS})
|
||||
kde4_automoc(kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
|
||||
|
||||
kde4_add_kdeinit_executable( kwin_rules_dialog ${kwin_rules_dialog_KDEINIT_SRCS})
|
||||
|
||||
target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY} )
|
||||
target_link_libraries(kdeinit_kwin_rules_dialog ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
|
||||
|
||||
install(TARGETS kdeinit_kwin_rules_dialog DESTINATION ${LIB_INSTALL_DIR} )
|
||||
|
||||
target_link_libraries( kwin_rules_dialog kdeinit_kwin_rules_dialog )
|
||||
install(TARGETS kwin_rules_dialog DESTINATION ${BIN_INSTALL_DIR})
|
||||
install(TARGETS kwin_rules_dialog DESTINATION bin)
|
||||
|
||||
########### next target ###############
|
||||
|
||||
set(kcm_kwinrules_PART_SRCS kcm.cpp ${kwinrules_SRCS})
|
||||
|
||||
kde4_automoc(${kcm_kwinrules_PART_SRCS})
|
||||
kde4_automoc(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
|
||||
|
||||
kde4_add_plugin(kcm_kwinrules ${kcm_kwinrules_PART_SRCS})
|
||||
|
||||
kde4_install_libtool_file( ${PLUGIN_INSTALL_DIR} kcm_kwinrules )
|
||||
|
||||
target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ${QT_QT3SUPPORT_LIBRARY})
|
||||
target_link_libraries(kcm_kwinrules ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} )
|
||||
|
||||
install(TARGETS kcm_kwinrules DESTINATION ${PLUGIN_INSTALL_DIR} )
|
||||
|
||||
|
||||
########### next target ###############
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES kwinrules.desktop DESTINATION ${SERVICES_INSTALL_DIR} )
|
||||
|
|
|
@ -5,11 +5,10 @@
|
|||
|
||||
set(kwin_killer_helper_SRCS killer.cpp )
|
||||
|
||||
kde4_automoc(${kwin_killer_helper_SRCS})
|
||||
kde4_automoc(kwin_killer_helper ${kwin_killer_helper_SRCS})
|
||||
|
||||
kde4_add_executable(kwin_killer_helper ${kwin_killer_helper_SRCS})
|
||||
|
||||
target_link_libraries(kwin_killer_helper ${KDE4_KDEUI_LIBS} )
|
||||
|
||||
install(TARGETS kwin_killer_helper DESTINATION ${BIN_INSTALL_DIR})
|
||||
|
||||
|
|
|
@ -43,28 +43,5 @@ if(OPENGL_FOUND)
|
|||
target_link_libraries(kwineffects -ldl)
|
||||
endif(OPENGL_FOUND)
|
||||
|
||||
install_files( /include FILES kwinglobals.h kwineffects.h kwinglutils.h kwinglutils_funcs.h )
|
||||
install( FILES kwinglobals.h kwineffects.h kwinglutils.h kwinglutils_funcs.h DESTINATION ${INCLUDE_INSTALL_DIR})
|
||||
|
||||
|
||||
#original Makefile.am contents follow:
|
||||
|
||||
## FRAME libkwin???
|
||||
#lib_LTLIBRARIES = libkdecorations.la
|
||||
#
|
||||
#libkdecorations_la_SOURCES = kdecoration.cpp kdecoration_p.cpp kdecoration_plugins_p.cpp \
|
||||
# kdecorationfactory.cpp kcommondecoration.cpp
|
||||
#libkdecorations_la_LIBADD = $(LIB_KDECORE)
|
||||
#libkdecorations_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
|
||||
#
|
||||
## FRAME
|
||||
#include_HEADERS = kdecoration.h kdecoration_p.h kdecoration_plugins_p.h \
|
||||
# kdecorationfactory.h kcommondecoration.h
|
||||
#
|
||||
#INCLUDES = $(all_includes)
|
||||
#METASOURCES = AUTO
|
||||
#
|
||||
#include ../../../admin/Doxyfile.am
|
||||
#
|
||||
#messages: rc.cpp
|
||||
# $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_lib.pot
|
||||
# -rm rc.cpp
|
||||
|
|
|
@ -1,4 +1,7 @@
|
|||
|
||||
|
||||
|
||||
########### install files ###############
|
||||
|
||||
install( FILES close.png maximize.png maximizedown.png menu.png iconify.png pindown.png pinup.png unknown.png fog.png fog-grey.png bluesun.png greenie.light.png greenie.dim.png DESTINATION ${DATA_INSTALL_DIR}/kwin/pics )
|
||||
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ add_subdirectory( decobenchmark )
|
|||
|
||||
set(test_gravity_SRCS test_gravity.cpp )
|
||||
|
||||
kde4_automoc(${test_gravity_SRCS})
|
||||
kde4_automoc(test_gravity ${test_gravity_SRCS})
|
||||
|
||||
kde4_add_executable(test_gravity ${test_gravity_SRCS})
|
||||
|
||||
|
|
|
@ -5,9 +5,8 @@
|
|||
|
||||
set(decobenchmark_SRCS main.cpp preview.cpp )
|
||||
|
||||
kde4_automoc(${decobenchmark_SRCS})
|
||||
kde4_automoc(decobenchmark ${decobenchmark_SRCS})
|
||||
|
||||
kde4_add_executable(decobenchmark ${decobenchmark_SRCS})
|
||||
|
||||
target_link_libraries(decobenchmark ${KDE4_KDECORE_LIBS} kdecorations )
|
||||
|
||||
|
|
Loading…
Reference in a new issue