Permalink
Browse files

Clean up the CMake files

This just brought to my notice a dependency on X11, that should in all
likelihood be removed in the future.
  • Loading branch information...
1 parent 98bbcd7 commit 72438c10e6d4eed4109475a07d9e221f0ef93331 @Montel Montel committed with Aug 7, 2008
View
@@ -41,32 +41,3 @@ add_subdirectory(src)
message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: skipped subdir $(TOPSUBDIRS)")
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#SUBDIRS = $(TOPSUBDIRS)
-#
-#$(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs
-# cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common configure.in ;
-#
-#$(top_srcdir)/subdirs:
-# cd $(top_srcdir) && $(MAKE) -f admin/Makefile.common subdirs
-#
-#$(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in
-# @cd $(top_srcdir) && cat admin/acinclude.m4.in admin/libtool.m4.in > acinclude.m4
-#
-#MAINTAINERCLEANFILES = subdirs configure.in acinclude.m4 configure.files
-#
-#package-messages:
-# $(MAKE) -f admin/Makefile.common package-messages
-# $(MAKE) -C po merge
-#
-#EXTRA_DIST = admin COPYING configure.in.in
-#
-#dist-hook:
-# cd $(top_distdir) && perl admin/am_edit -padmin
-# cd $(top_distdir) && $(MAKE) -f admin/Makefile.common subdirs
@@ -1,27 +1,4 @@
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### install files ###############
-
install(FILES abstract.png alien-artifact.png basket-title.png green-curves.png light.png painting.png pens.png pins.png rainbow-balls.png rounds-line.png strings.png todo.png working.png DESTINATION ${DATA_INSTALL_DIR}/basket/backgrounds/previews)
-
-#original Makefile.am contents follow:
-
-#backgroundspreviewsdir = $(kde_datadir)/basket/backgrounds/previews
-#backgroundspreviews_DATA = \
-# abstract.png \
-# alien-artifact.png \
-# basket-title.png \
-# green-curves.png \
-# light.png \
-# painting.png \
-# pens.png \
-# pins.png \
-# rainbow-balls.png \
-# rounds-line.png \
-# strings.png \
-# todo.png \
-# working.png
View
@@ -1,27 +1,3 @@
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### install files ###############
-
install(FILES abstract.png alien-artifact.png alien-artifact.png.config basket-title.png green-curves.png light.png painting.png pens.png pins.png rainbow-balls.png rounds-line.png strings.png todo.png working.png DESTINATION ${DATA_INSTALL_DIR}/basket/backgrounds)
-
-
-#original Makefile.am contents follow:
-
-#backgroundsdir = $(kde_datadir)/basket/backgrounds
-#backgrounds_DATA = \
-# abstract.png \
-# alien-artifact.png alien-artifact.png.config \
-# basket-title.png \
-# green-curves.png \
-# light.png \
-# painting.png \
-# pens.png \
-# pins.png \
-# rainbow-balls.png \
-# rounds-line.png \
-# strings.png \
-# todo.png \
-# working.png
@@ -1,14 +1,9 @@
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### next target ###############
-
set(basketthumbcreator_PART_SRCS basketthumbcreator.cpp)
kde4_add_plugin(basketthumbcreator ${basketthumbcreator_PART_SRCS})
-target_link_libraries(basketthumbcreator ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
+target_link_libraries(basketthumbcreator ${KDE4_KIO_LIBS})
install(TARGETS basketthumbcreator DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -20,31 +15,3 @@ install(FILES basket.magic DESTINATION ${CONFIG_INSTALL_DIR}/magic)
install(FILES x-basket-archive.desktop x-basket-template.desktop DESTINATION ${MIME_INSTALL_DIR}/application)
kde4_install_icons(${ICON_INSTALL_DIR})
-
-
-
-#original Makefile.am contents follow:
-
-## MIME Types Information:
-#applicationmimedir = $(kde_mimedir)/application
-#applicationmime_DATA = x-basket-archive.desktop x-basket-template.desktop
-#
-## Magic MIME Types Discovery:
-#magicdir = $(kde_confdir)/magic
-#magic_DATA = basket.magic
-#
-## Thumbnail Creator:
-#INCLUDES = $(all_includes)
-#kde_module_LTLIBRARIES = basketthumbcreator.la
-#basketthumbcreator_la_SOURCES = basketthumbcreator.cpp
-#basketthumbcreator_la_LIBADD = $(LIB_KIO)
-#basketthumbcreator_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-#kde_services_DATA = basketthumbcreator.desktop
-#
-## Icons:
-#KDE_ICON = AUTO
-##kde_icon_KDEICON = \
-## cr128-mimetype-baskets.png cr16-mimetype-baskets.png cr22-mimetype-baskets.png \
-## cr32-mimetype-baskets.png cr48-mimetype-baskets.png cr64-mimetype-baskets.png \
-## cr128-mimetype-baskett.png cr16-mimetype-baskett.png cr22-mimetype-baskett.png \
-## cr32-mimetype-baskett.png cr48-mimetype-baskett.png cr64-mimetype-baskett.png
View
@@ -1,16 +1 @@
-
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### install files ###############
-
install(FILES insertion_help.png tag_export_help.png tag_export_on_every_lines_help.png DESTINATION ${DATA_INSTALL_DIR}/basket/images)
-
-
-
-#original Makefile.am contents follow:
-
-#imagesdir = $(kde_datadir)/basket/images
-#images_DATA = insertion_help.png \
-# tag_export_help.png \
-# tag_export_on_every_lines_help.png
@@ -1,9 +1,3 @@
-
-include_directories(${CMAKE_SOURCE_DIR}/src ${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### next target ###############
-
set(kontact_basket_PART_SRCS basket_plugin.cpp uniqueapphandler.cpp)
message(STATUS "DCOP has been removed in KDE 4; port code to D-Bus. kde4_add_dcop_skels macro does not exist anymore. We keep it just to remember to port to D-Bus.")
@@ -12,7 +6,7 @@ message(STATUS "DCOP has been removed in KDE 4; port code to D-Bus. kde4_add_dco
kde4_add_plugin(kontact_basket WITH_PREFIX ${kontact_basket_PART_SRCS})
-target_link_libraries(kontact_basket ${KDE4_KDECORE_LIBS} kpinterfaces DCOP qt-mt kdecore kdeui)
+target_link_libraries(kontact_basket ${KDE4_KDEUI_LIBS} kpinterfaces )
install(TARGETS kontact_basket DESTINATION ${PLUGIN_INSTALL_DIR})
@@ -22,25 +16,3 @@ install(TARGETS kontact_basket DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES kontact_basketplugin.setdlg DESTINATION ${DATA_INSTALL_DIR}/kontact/ksettingsdialog)
install(FILES basket.desktop basket_v4.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kontact)
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir) $(all_includes)
-#
-#kde_module_LTLIBRARIES = libkontact_basket.la
-#libkontact_basket_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-#libkontact_basket_la_LIBADD = -lkpinterfaces -lDCOP -lqt-mt -lkdecore -lkdeui
-#
-#noinst_HEADERS = basket_plugin.h uniqueapphandler.h
-#libkontact_basket_la_SOURCES = basket_plugin.cpp uniqueapphandler.cpp basketdcopiface.stub
-#
-#METASOURCES = AUTO
-#
-#basketdcopiface_DIR = $(top_srcdir)/src
-#
-#servicedir = $(kde_servicesdir)/kontact
-#service_DATA = basket.desktop basket_v4.desktop
-#
-#basketsetdlgdir = $(kde_datadir)/kontact/ksettingsdialog
-#basketsetdlg_DATA = kontact_basketplugin.setdlg
View
@@ -1,10 +1,4 @@
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### install files ###############
-
-
#original Makefile.am contents follow:
View
@@ -54,13 +54,17 @@ kde4_add_library(basketcommon SHARED ${basketcommon_LIB_SRCS})
target_link_libraries(basketcommon
${KDE4_KDE3SUPPORT_LIBS} # Remove me
- ${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS}
${KDE4_KDEUI_LIBS}
${KDE4_KPARTS_LIBS}
+ ${KDE4_KFILE_LIBS}
${QIMAGEBLITZ_LIBRARIES}
${GPGME_VANILLA_LIBRARIES})
+if(Q_WS_X11)
+ target_link_libraries(basketcommon ${X11_X11_LIB})
+endif(Q_WS_X11)
+
set_target_properties(basketcommon PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
install(TARGETS basketcommon DESTINATION ${LIB_INSTALL_DIR})
@@ -72,8 +76,8 @@ set(basket_SRCS main.cpp mainwindow.cpp application.cpp)
kde4_add_executable(basket ${basket_SRCS})
target_link_libraries(basket
${KDE4_KDE3SUPPORT_LIBS} # Remove me as well
- ${KDE4_KDECORE_LIBS}
${KDE4_KUTILS_LIBS}
+ ${KDE4_KFILE_LIBS}
basketcommon)
install(TARGETS basket DESTINATION ${BIN_INSTALL_DIR})
@@ -115,112 +119,3 @@ install(FILES basketui.rc DESTINATION ${DATA_INSTALL_DIR}/basket)
kde4_install_icons(${ICON_INSTALL_DIR})
-
-#original Makefile.am contents follow:
-
-## set the include path for X, qt and KDE
-#INCLUDES = $(all_includes)
-#
-## let automoc handle all of the meta source files (moc)
-#METASOURCES = AUTO
-#
-#messages: rc.cpp
-# $(XGETTEXT) *.cpp -o $(podir)/basket.pot
-#
-#KDE_ICON = AUTO
-#
-## these are the headers for your project
-#
-#noinst_HEADERS = basket.h basketproperties.h mainwindow.h basket_part.h \
-# debugwindow.h linklabel.h variouswidgets.h xmlwork.h keyboard.h global.h settings.h \
-# focusedwidgets.h popupmenu.h basketfactory.h exporterdialog.h tag.h kcolorcombo2.h \
-# newbasketdialog.h tagsedit.h note.h notecontent.h notedrag.h noteedit.h notefactory.h \
-# filter.h tools.h backgroundmanager.h regiongrabber.h softwareimporters.h \
-# kicondialog.h kiconcanvas.h kgpgme.h crashhandler.h password.h bnpview.h \
-# systemtray.h clickablelabel.h colorpicker.h basketlistview.h qeffects.h likeback.h \
-# formatimporter.h aboutdata.h basketstatusbar.h basketdcopiface.h basket_options.h \
-# likeback_private.h application.h archive.h htmlexporter.h backup.h
-#
-##########################################################################
-## COMMON FILES SECTION
-##########################################################################
-#
-#lib_LTLIBRARIES = libbasketcommon.la
-#
-#AM_CPPFLAGS = $(GPGME_CFLAGS)
-#
-#libbasketcommon_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries)
-#
-#libbasketcommon_la_LIBADD = $(LIB_ARTSKDE) -lkio $(LIB_KDEUI) $(LIB_KDECORE) \
-# $(LIB_QT) $(LIBSOCKET) $(GPGME_LIBS) $(LIB_KPARTS) -lDCOP -lkdefx -lkdeui
-#
-#libbasketcommon_la_SOURCES = \
-# archive.cpp bnpview.cpp settings.cpp basket.cpp basketproperties.cpp \
-# linklabel.cpp variouswidgets.cpp xmlwork.cpp keyboard.cpp \
-# global.cpp exporterdialog.cpp htmlexporter.cpp notefactory.cpp softwareimporters.cpp \
-# focusedwidgets.cpp popupmenu.cpp basketfactory.cpp \
-# tag.cpp qeffects.cpp kcolorcombo2.cpp newbasketdialog.cpp tagsedit.cpp \
-# formatimporter.cpp note.cpp notecontent.cpp notedrag.cpp noteedit.cpp \
-# filter.cpp tools.cpp backgroundmanager.cpp regiongrabber.cpp \
-# kicondialogui.ui kicondialog.cpp kiconcanvas.cpp kgpgme.cpp likeback.cpp \
-# crashhandler.cpp passwordlayout.ui password.cpp colorpicker.cpp \
-# basketlistview.cpp debugwindow.cpp systemtray.cpp aboutdata.cpp \
-# basketstatusbar.cpp clickablelabel.cpp basketdcopiface.skel backup.cpp
-#
-##########################################################################
-## APPLICATION SECTION
-##########################################################################
-## this is the program that gets installed. it's name is used for all
-## of the other Makefile.am variables
-#bin_PROGRAMS = basket
-#
-## the application source, library search path, and link libraries
-#basket_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_KUTILS)
-#basket_LDADD = libbasketcommon.la
-#
-## this is where the desktop file will go
-#shelldesktopdir = $(kde_appsdir)/Utilities
-#shelldesktop_DATA = basket.desktop
-#
-## this is where the shell's XML-GUI resource file goes
-#rcdir = $(kde_datadir)/basket
-#rc_DATA = basketui.rc
-#
-#basket_SOURCES = main.cpp mainwindow.cpp application.cpp
-#
-#kde_icon_KDEICON = cr128-app-basket.png cr16-app-basket.png cr22-app-basket.png \
-# cr32-app-basket.png cr48-app-basket.png cr64-app-basket.png hi16-app-basket_old.png \
-# hi32-app-basket_old.png crsc-app-basket.svg \
-# cr16-action-likeback_like.png cr16-action-likeback_dislike.png \
-# cr16-action-likeback_bug.png cr16-action-likeback_feature.png
-#
-###################
-## KPART SECTION
-###################
-#
-#kde_module_LTLIBRARIES = kcm_basket.la libbasketpart.la
-#
-#libbasketpart_la_SOURCES = basket_part.cpp
-#libbasketpart_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined
-#libbasketpart_la_LIBADD = libbasketcommon.la -lkparts -lkdeui $(LIB_KDECORE) $(LIB_QT) -lDCOP
-#
-#kcm_basket_la_SOURCES = kcm_basket.cpp
-#kcm_basket_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-#kcm_basket_la_LIBADD = libbasketcommon.la $(LIB_KDECORE) $(LIB_QT) -lkdeui
-#
-## this is where the desktop file will go
-#partdesktopdir = $(kde_servicesdir)
-#partdesktop_DATA = basket_part.desktop
-#
-## this is where the part's XML-GUI resource file goes
-#partdir = $(kde_datadir)/basket
-#part_DATA = basket_part.rc
-#
-#kde_services_DATA = \
-# basket_config_general.desktop \
-# basket_config_baskets.desktop \
-# basket_config_new_notes.desktop \
-# basket_config_notes_appearance.desktop \
-# basket_config_apps.desktop \
-# basket_config_features.desktop \
-# basket_config_notes.desktop
View
@@ -1,17 +1 @@
-
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
-
-
-########### install files ###############
-
-install(FILES DESTINATION ${DATA_INSTALL_DIR}/basket/icons)
-
kde4_install_icons(${ICON_INSTALL_DIR})
-
-
-
-#original Makefile.am contents follow:
-
-#tagsdir = $(kde_datadir)/basket/icons
-#tags_ICON = AUTO
-#KDE_ICON = AUTO
View
@@ -1,22 +1,4 @@
+FILE (GLOB BASKETS_FILES *.baskets)
-include_directories(${KDE4_INCLUDES} ${KDE4_INCLUDE_DIR} ${QT_INCLUDES} )
+install(FILES ${BASKETS_FILES} DESTINATION ${DATA_INSTALL_DIR}/basket/welcome)
-
-########### install files ###############
-
-install(FILES Welcome_de.baskets Welcome_en_US.baskets Welcome_fr.baskets Welcome_it.baskets Welcome_ja.baskets Welcome_nn.baskets Welcome_pt.baskets Welcome_ru.baskets DESTINATION ${DATA_INSTALL_DIR}/basket/welcome)
-
-
-
-#original Makefile.am contents follow:
-
-#welcomedir = $(kde_datadir)/basket/welcome
-#welcome_DATA = \
-# Welcome_de.baskets \
-# Welcome_en_US.baskets \
-# Welcome_fr.baskets \
-# Welcome_it.baskets \
-# Welcome_ja.baskets \
-# Welcome_nn.baskets \
-# Welcome_pt.baskets \
-# Welcome_ru.baskets

0 comments on commit 72438c1

Please sign in to comment.