[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: playground/pim/kcall/kcall
From: Eva Brucherseifer <eva () kde ! org>
Date: 2007-07-22 16:45:24
Message-ID: 1185122724.459129.24529.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 690978 by eva:
- split kcall binary into a library and a binary
=> will become a part later
- added new class KCallCore
M +38 -22 CMakeLists.txt
A kcallcore.cpp [License: LGPL (v2.1+)]
A kcallcore.h [License: LGPL (v2.1)]
M +1 -0 kcallview.cpp
--- trunk/playground/pim/kcall/kcall/CMakeLists.txt #690977:690978
@@ -1,17 +1,9 @@
-
project(kcallgui)
+add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
+#SET(QT_USE_QT3SUPPORT ON)
+#SET(KDE4_USE_KDE3SUPPORT ON)
-# find_package (KDE4 REQUIRED)
-# include(KDE4Defaults)
-# include(MacroLibrary)
-# include(MacroOptionalAddSubdirectory)
-
-# find_package(KdepimLibs REQUIRED)
-
-SET(QT_USE_QT3SUPPORT ON)
-SET(KDE4_USE_KDE3SUPPORT ON)
-
INCLUDE(${QT_USE_FILE})
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include
@@ -33,9 +25,27 @@
"${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}"
)
-SET(kcallgui_SRCS
- main.cpp
- # kcallcore.cpp
+########### next target ###############
+
+set(kcall_bin_SRCS
+ main.cpp
+#kcallmain.cpp
+ )
+
+#qt4_add_dbus_adaptor(kaddressbook_bin_SRCS org.kde.KAddressbook.Core.xml \
kaddressbookmain.h KAddressBookMain kaddressbookadaptor ) +
+kde4_add_executable(kcall_bin ${kcall_bin_SRCS})
+set_target_properties(kcall_bin PROPERTIES OUTPUT_NAME kcall)
+
+target_link_libraries(kcall_bin kcall ${KDE4_KHTML_LIBS})
+
+install(TARGETS kcall_bin DESTINATION ${BIN_INSTALL_DIR} )
+
+########### next target ###############
+
+
+SET(kcall_LIB_SRCS
+ kcallcore.cpp
decibeldialer.cpp
decibelchannelhandler.cpp
kcallview.cpp
@@ -44,28 +54,34 @@
historyprovider.cpp
)
-QT4_ADD_DBUS_INTERFACE(kcallgui_SRCS
+QT4_ADD_DBUS_INTERFACE(kcall_LIB_SRCS
log.xml
decibel_log
Decibel/Types
)
-kde4_add_kcfg_files( kcallgui_SRCS kcallsettings.kcfgc )
+kde4_add_kcfg_files( kcall_LIB_SRCS kcallsettings.kcfgc )
-KDE4_ADD_UI_FILES(kcallgui_SRCS keypad.ui kcallview.ui vcardview.ui)
+KDE4_ADD_UI_FILES(kcall_LIB_SRCS keypad.ui kcallview.ui vcardview.ui)
-KDE4_ADD_EXECUTABLE(kcallgui ${kcallgui_SRCS})
-TARGET_LINK_LIBRARIES(kcallgui
+kde4_add_library(kcall SHARED ${kcall_LIB_SRCS})
+
+TARGET_LINK_LIBRARIES(kcall
${KDE4_KDEUI_LIBS}
${KDE4_KABC_LIBS}
decibel
${KDE4_KDE3SUPPORT_LIBS}
${QT_QT3SUPPORT_LIBS}
)
-INSTALL(TARGETS kcallgui
- DESTINATION ${BIN_INSTALL_DIR}
-)
+set_target_properties(kcall PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION \
${GENERIC_LIB_SOVERSION} ) +install(TARGETS kcall DESTINATION ${LIB_INSTALL_DIR})
+
+########### install files ###############
+
+
+install( FILES kcall.desktop DESTINATION ${XDG_APPS_DIR})
+
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${SERVICE_FILE}
DESTINATION ${DBUS_SERVICES_INSTALL_DIR}
)
--- trunk/playground/pim/kcall/kcall/kcallview.cpp #690977:690978
@@ -120,6 +120,7 @@
connect( ui.nrInput, SIGNAL(returnPressed(const QString&)), this, \
SLOT(dialByInput(const QString&)));
connect( ui.nrInput, SIGNAL(textChanged(const QString&)), ui.nrInput, \
SLOT(setCompletedText(const QString&)));
connect( ui.phonebookList, SIGNAL(clicked(Q3ListViewItem*)), this, \
SLOT(setVCard(Q3ListViewItem*))); + connect( m_vcardView, SIGNAL( \
phoneNumberClicked(QString& )), this, SLOT( dialByInput(const \
QString&)));
connect( ui.acceptButton, SIGNAL(clicked()), this, SLOT(decideAcceptAction()));
connect( m_historyProvider, SIGNAL(updateHistory()), this, \
SLOT(setHistoryList()));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic