← Back to branch summary

~ubuntu-branches/ubuntu/vivid/quassel/vivid-updates

« back to all changes in this revision

Viewing changes to src/client/CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): Scott Kitterman, Michael Marley
  • Date: 2015-02-19 07:42:04 UTC
  • mfrom: (1.1.59)
  • Revision ID: package-import@ubuntu.com-20150219074204-vu1qv4i0devi2j2t
Tags: 0.12~beta1-0ubuntu1
[ Michael Marley ]
* New upstream kf5 based beta release
  - Drop patches debian/patches/CVE-2014-8483.patch,
    upstream_qca-qt5-cmake.patch and upstream_qca-qt5-code.patch
  - Add kf5 build-deps
  - Adjust install paths
* Fix upstart job to avoid race conditions on restart

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/CMakeLists.txt
38
38
    clientcoreinfo.h
39
39
)
40
40
 
41
 
if (KDE4_FOUND)
42
 
    include_directories(${KDE4_INCLUDES})
43
 
    add_definitions(-DHAVE_KDE ${KDE4_DEFINITIONS})
44
 
endif()
45
 
 
46
41
if (USE_QT5)
47
42
    list(APPEND qt_modules Widgets)
48
43
endif()
52
47
add_library(mod_client STATIC ${SOURCES})
53
48
qt_use_modules(mod_client Network Core Gui ${qt_modules})
54
49
 
55
 
if (KDE4_FOUND)
56
 
    target_link_libraries(mod_client ${KDE4_SOLID_LIBS})
57
 
endif()
58
 
 
59
 
add_dependencies(mod_client mod_common)
 
50
target_link_libraries(mod_client mod_common)