From a8435f7b72462753d65affe0708e6ec6838119cd Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 25 Nov 2011 15:03:41 -0600 Subject: [PATCH] Migrate main cmake file --- kbfxlib/common/CMakeLists.txt | 15 +---- src/CMakeLists.txt | 107 +++++++++++++++------------------- 2 files changed, 49 insertions(+), 73 deletions(-) diff --git a/kbfxlib/common/CMakeLists.txt b/kbfxlib/common/CMakeLists.txt index c453732..d10e847 100644 --- a/kbfxlib/common/CMakeLists.txt +++ b/kbfxlib/common/CMakeLists.txt @@ -13,9 +13,8 @@ include_directories( ${TQT_INCLUDE_DIRS} ${TDE_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${CMAKE_BINARY_DIR}/src - ${CMAKE_SOURCE_DIR}/src - ${CMAKE_SOURCE_DIR}/kio/kio + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} ) link_directories( @@ -23,15 +22,7 @@ link_directories( ) -##### other data ################################ - -install( FILES locate.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES locater.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES rlocate.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES locate.desktop DESTINATION ${SERVICES_INSTALL_DIR}/searchproviders ) - - -##### libkbfxcommonsrc ############################## +##### kbfxcommon ################################# set( target kbfxcommon ) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c81c616..65f92ae 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,62 +1,47 @@ -SET(libkbfxspinxsrc - kbfxbutton.cpp - kbfxplasmacanvasabstractitem.cpp - kbfxplasmacanvasgroup.cpp - kbfxplasmacanvasgroupview.cpp - kbfxplasmacanvasitem.cpp - kbfxplasmacanvasitem_events.cpp - kbfxplasmacanvasitemwrapper.cpp - kbfxplasmacanvasstack.cpp - kbfxplasmacanvasview.cpp - kbfxplasmaindexitem.cpp - kbfxplasmaindexview.cpp - kbfxspinx.cpp - kbfxspinxmenu.cpp - kbfxspinxpopup.cpp - kbfxspinxscrollbar.cpp - kbfxspinxtoolbar.cpp - kbfxspinxtoolbutton.cpp - kbfxspinxtop.cpp - kbfxspinxview.cpp - kbfxtooltip.cpp - ) - -IF (NOT USE_KDE4) - KDE3_ADD_DCOP_SKELS(libkbfxspinxsrc kbfxspinx.h) - KDE3_AUTOMOC(${libkbfxspinxsrc}) - - ADD_LIBRARY(kbfxspinx MODULE ${libkbfxspinxsrc}) - SET_TARGET_PROPERTIES(kbfxspinx - PROPERTIES - COMPILE_FLAGS ${CMAKE_SHARED_LIBRARY_CXX_FLAGS}) - # SET_TARGET_PROPERTIES(kbfxspinx PROPERTIES - # SOVERSION ${LIB_MAJOR} - # VERSION ${APPLICATION_VERSION}) - TARGET_LINK_LIBRARIES(kbfxspinx - kbfxdata - kbfxcommon - ${QT_AND_TDECORE_LIBS} - ${KDE3_UI_LIBRARY} - ) - - KDE3_INSTALL_LIBTOOL_FILE(kbfxspinx ${PLUGIN_INSTALL_DIR}) -ELSE (NOT USE_KDE4) - # TODO: Have to rewrite it for DBUS. - # Rewrite the DCOP interface (in src/) to DBUS for KDE4 support. - # Should be done in a way to preserve KDE3 compatibility! - KDE4_ADD_DCOP_SKELS(libkbfxspinxsrc kbfxspinx.h) - KDE4_AUTOMOC(${libkbfxspinxsrc}) - - KDE4_ADD_LIBRARY(kbfxspinx MODULE ${libkbfxspinxsrc}) - TARGET_LINK_LIBRARIES(kbfxspinx - kbfxdata - kbfxcommon - ${KDE4_TDECORE_LIBS} - ${KDE4_TDEUI_LIBS} - ) - - KDE4_INSTALL_LIBTOOL_FILE(kbfxspinx ${PLUGIN_INSTALL_DIR}) -ENDIF (NOT USE_KDE4) - -INSTALL(TARGETS kbfxspinx DESTINATION ${PLUGIN_INSTALL_DIR}) +################################################# +# +# (C) 2011 Timothy Pearson +# kb9vqf (AT) pearsoncomputing.net +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +include_directories( + ${TQT_INCLUDE_DIRS} + ${TDE_INCLUDE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_SOURCE_DIR} +) + +link_directories( + ${TQT_LIBRARY_DIRS} +) + + +##### kbfxspinx ################################## + +set( target kbfxspinx ) + +set( ${target}_SRCS + kbfxbutton.cpp kbfxplasmacanvasabstractitem.cpp kbfxplasmacanvasgroup.cpp + kbfxplasmacanvasgroupview.cpp kbfxplasmacanvasitem.cpp kbfxplasmacanvasitem_events.cpp + kbfxplasmacanvasitemwrapper.cpp kbfxplasmacanvasstack.cpp kbfxplasmacanvasview.cpp + kbfxplasmaindexitem.cpp kbfxplasmaindexview.cpp kbfxspinx.cpp kbfxspinxmenu.cpp + kbfxspinxpopup.cpp kbfxspinxscrollbar.cpp kbfxspinxtoolbar.cpp kbfxspinxtoolbutton.cpp + kbfxspinxtop.cpp kbfxspinxview.cpp kbfxtooltip.cpp +) + +tde_add_kpart( ${target} AUTOMOC + SOURCES ${${target}_SRCS} + LINK tdecore-shared tdeui-shared kbfxspinx kbfxdata kbfxcommon + DESTINATION ${PLUGIN_INSTALL_DIR} +) + + +##### desktop files ############################### + INSTALL(FILES kbfxspinx.desktop DESTINATION ${DATA_INSTALL_DIR}/kicker/applets)