[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/pim/kcall
From:       Tobias Hunger <tobias.hunger () basyskom ! de>
Date:       2007-07-21 10:12:17
Message-ID: 1185012737.400168.12532.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 690509 by hunger:

Remove automoc, add some useful variables to the CMakeFiles.


 M  +11 -1     CMakeLists.txt  
 M  +1 -22     applet/audio/CMakeLists.txt  
 M  +4 -6      applet/kcall/CMakeLists.txt  
 M  +0 -4      kcall/src/CMakeLists.txt  


--- trunk/playground/pim/kcall/CMakeLists.txt #690508:690509
@@ -1,9 +1,19 @@
+PROJECT(KCall)
 
+SET(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
+
 FIND_PACKAGE(KDE4 REQUIRED)
+INCLUDE(UsePkgConfig REQUIRED)
 
+SET(MAYOR_VERSION "0")
+SET(MINOR_VERSION "6")
+SET(PATCH_LEVEL "0")
+
+SET(VERSION "${MAYOR_VERSION}.${MINOR_VERSION}.${PATCH_LEVEL}")
+
 SET(CMAKE_VERBOSE_MAKEFILE ON)
 
-ADD_DEFINITIONS(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ADD_DEFINITIONS(${QT4_DEFINITIONS} ${KDE4_DEFINITIONS})
 
 LINK_DIRECTORIES(${KDE4_LIB_DIR})
 
--- trunk/playground/pim/kcall/applet/audio/CMakeLists.txt #690508:690509
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} \
${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR}  ) +INCLUDE_DIRECTORIES( \
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE4_INCLUDE_DIR} \
${QT_INCLUDE_DIR}  )  
 
 ########### next target ###############
@@ -28,8 +28,6 @@
    rtpdataheader.h
    )
 
-KDE3_AUTOMOC(${kcallaudio_LIB_SRCS})
-
 ADD_LIBRARY(kcallaudio SHARED ${kcallaudio_LIB_SRCS})
 
 TARGET_LINK_LIBRARIES(kcallaudio  ${QT_AND_KDECORE_LIBS} gsm ilbc )
@@ -37,22 +35,3 @@
 SET_TARGET_PROPERTIES(kcallaudio PROPERTIES VERSION 4.2.0 SOVERSION 4 )
 INSTALL(TARGETS kcallaudio DESTINATION lib} )
 
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-#INCLUDES = -I../kcallsipsettings $(all_includes)
-#METASOURCES = AUTO
-#
-#lib_LTLIBRARIES = libkcallaudio.la
-#libkcallaudio_la_LDFLAGS = $(all_libraries)
-#libkcallaudio_la_SOURCES = audiobuffer.cpp audiobuffer.h callaudio.cpp callaudio.h\
-#	dspaudio.cpp dspaudio.h dspaudioin.cpp dspaudioin.h dspaudioout.cpp\
-#	dspaudioout.h dspout.cpp dspout.h dspoutoss.cpp dspoutoss.h\
-#	dspoutrtp.cpp dspoutrtp.h dtmfgenerator.cpp dtmfgenerator.h g711.cpp\
-#	g711.h kphoneconst.h rtpdataheader.h
-#libkcallaudio_la_LIBADD = ../gsm/libgsm.la ../ilbc/libilbc.la
--- trunk/playground/pim/kcall/applet/kcall/CMakeLists.txt #690508:690509
@@ -1,6 +1,6 @@
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
-                    ${KDE3_INCLUDE_DIR}
+                    ${KDE4_INCLUDE_DIR}
                     ${QT_INCLUDE_DIR}
 )
 
@@ -16,22 +16,20 @@
     ksipauthentication.cpp
 )
 
-KDE3_AUTOMOC(${kcallapplet_SRCS})
-
 SET(kcallapplet_UI
     incomingdialog.ui
     dialdialog.ui
 )
 
-KDE3_ADD_UI_FILES(kcallapplet_SRCS ${kcallapplet_UI} )
+KDE4_ADD_UI_FILES(kcallapplet_SRCS ${kcallapplet_UI} )
 
 SET(kcallapplet_DCOP_SKEL_SRCS
     kcallcore.h
 )
 
-KDE3_ADD_DCOP_SKELS(kcallapplet_SRCS ${kcallapplet_DCOP_SKEL_SRCS})
+KDE4_ADD_DCOP_SKELS(kcallapplet_SRCS ${kcallapplet_DCOP_SKEL_SRCS})
 
-KDE3_ADD_EXECUTABLE(kcallapplet ${kcallapplet_SRCS})
+KDE4_ADD_EXECUTABLE(kcallapplet ${kcallapplet_SRCS})
 
 TARGET_LINK_LIBRARIES(kcallapplet
                       ${QT_AND_KDECORE_LIBS}
--- trunk/playground/pim/kcall/kcall/src/CMakeLists.txt #690508:690509
@@ -13,8 +13,6 @@
     kcallgui.cpp
 )
 
-KDE4_AUTOMOC(${kcall_SRCS})
-
 KDE4_ADD_EXECUTABLE(kcall ${kcall_SRCS})
 
 TARGET_LINK_LIBRARIES(kcall  ${QT_AND_KDECORE_LIBS} kparts )
@@ -34,8 +32,6 @@
     phonenrwidget.ui.h
 )
 
-KDE4_AUTOMOC(${kcallpart_PART_SRCS})
-
 SET(kcallpart_UI
     kcallguimain.ui
     viscard.ui


[prev in list] [next in list] [prev in thread] [next in thread]