← Back to branch summary

~ubuntu-branches/ubuntu/wily/sflphone/wily

« back to all changes in this revision

Viewing changes to kde/src/klib/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2014-01-28 18:23:36 UTC
  • mfrom: (1.1.11)
  • mto: This revision was merged to the branch mainline in revision 24.
  • Revision ID: package-import@ubuntu.com-20140128182336-3xenud1kbnwmf3mz
http://bugs.debian.org/735846
http://bugs.debian.org/727164
http://bugs.debian.org/718178
http://bugs.debian.org/736583
http://bugs.debian.org/722040
http://bugs.debian.org/736746
* New upstream release 
  - Fixes "New Upstream Release" (Closes: #735846)
  - Fixes "Ringtone does not stop" (Closes: #727164)
  - Fixes "[sflphone-kde] crash on startup" (Closes: #718178)
  - Fixes "sflphone GUI crashes when call is hung up" (Closes: #736583)
* Build-Depends: ensure GnuTLS 2.6
  - libucommon-dev (>= 6.0.7-1.1), libccrtp-dev (>= 2.0.6-3)
  - Fixes "FTBFS Build-Depends libgnutls{26,28}-dev" (Closes: #722040)
* Fix "boost 1.49 is going away" unversioned Build-Depends: (Closes: #736746)
* Add Build-Depends: libsndfile-dev, nepomuk-core-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
kde/src/klib/CMakeLists.txt
12
12
SET ( KDE4_KABC_LIBS  -lkabc )
13
13
 
14
14
 
15
 
add_subdirectory(dataengine)
 
15
# add_subdirectory(dataengine)
16
16
 
17
17
SET(LOCAL_CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/")
18
18
SET(CMAKE_MODULE_PATH "${LOCAL_CMAKE_MODULE_PATH}")
19
19
 
20
20
FIND_PACKAGE ( KDE4 REQUIRED )
21
21
FIND_PACKAGE ( Qt4 REQUIRED )
 
22
FIND_PACKAGE ( KdepimLibs REQUIRED )
22
23
 
23
24
INCLUDE ( KDE4Defaults )
24
25
 
25
 
set(GENERIC_LIB_VERSION "1.2.3")
 
26
set(GENERIC_LIB_VERSION "1.3.0")
26
27
 
27
 
INCLUDE_DIRECTORIES ( ${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
 
28
include_directories(SYSTEM  ${QT_INCLUDES}  ${KDE4_INCLUDES} )
 
29
INCLUDE_DIRECTORIES (${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
28
30
 
29
31
#File to compile
30
32
set( ksflphone_LIB_SRCS
31
33
   helperfunctions.cpp
32
34
   akonadibackend.cpp
33
 
   sortabledockcommon.cpp
34
 
   configurationskeleton.cpp
 
35
#    configurationskeleton.cpp
35
36
   tipmanager.cpp
36
37
   tip.cpp
37
38
   tipanimationwrapper.cpp
38
39
   macromodel.cpp
 
40
   bookmarkmodel.cpp
 
41
   macro.cpp
39
42
)
40
43
 
41
44
KDE4_ADD_KCFG_FILES(ksflphone_LIB_SRCS kcfg_settings.kcfgc)
46
49
  qtsflphone
47
50
  ${QT_QTCORE_LIBRARY}
48
51
  ${KDEPIMLIBS_AKONADI_KMIME_LIBS}
 
52
  ${KDEPIMLIBS_KABC_LIBS}
49
53
  ${KDEPIMLIBS_AKONADI_LIBS}
50
54
  ${KDEPIMLIBS_AKONADI_CONTACT_LIBS}
51
55
  ${KDE4_KDEUI_LIBS}
58
62
set( ksflphone_LIB_HDRS
59
63
  akonadibackend.h
60
64
  helperfunctions.h
61
 
  sortabledockcommon.h
 
65
#   sortabledockcommon.h
62
66
  macromodel.h
 
67
  macro.h
63
68
)
64
69
 
65
70
INSTALL(FILES sflphone-client-kde.kcfg DESTINATION ${KCFG_INSTALL_DIR})