~ubuntu-branches/ubuntu/wily/thumbnailer/wily-proposed

« back to all changes in this revision

Viewing changes to CMakeLists.txt

  • Committer: Package Import Robot
  • Author(s): CI Train Bot, James Henstridge, Michi Henning, CI Train Bot
  • Date: 2015-07-15 02:03:28 UTC
  • mfrom: (1.1.29)
  • Revision ID: package-import@ubuntu.com-20150715020328-p98z3qkq2kdr0lnt
Tags: 2.1+15.10.20150715-0ubuntu1
[ James Henstridge ]
* Expose more settings for the thumbnailer daemon via GSettings.
* Change the security policy implementation to use aa_query_label()
  for file access checks rather than relying on file descriptor
  passing.  This avoids the file descriptor exhaustion bugs with the
  previous implementation. (LP: #1381713)

[ Michi Henning ]
* Add thumbnailer-admin tool, which can be used to check the status
  of the cache and generate thumbnails via the command line.
* Add time stamps to log messages.
* Reduce the memory footprint of small caches, which in turn reduces
  the footprint of thumbnailer-service.
* Don't implicitly compact the cache on service shutdown, as this
  can take some time.
* Persist the cache stats over restarts of thumbnailer-service.
* Don't save JPEG thumbnails at quality=100, since the quality
  improvement isn't justified by the extra storage.
* Don't retry downloads when we have a hit from the failure cache.
* Warn if an app requests an unsized thumbnail.

[ CI Train Bot ]
* New rebuild forced.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
 
3
3
set(CMAKE_INCLUDE_CURRENT_DIR ON)
4
4
 
5
 
cmake_minimum_required(VERSION 2.8.10)
 
5
cmake_minimum_required(VERSION 2.8.11)
 
6
 
 
7
# Suppress complaints by cmake about COMPILE_DEFINITIONS_<Config> caused by qt5 cmake macros.
 
8
cmake_policy(SET CMP0043 OLD)
6
9
 
7
10
string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lower case
8
11
 
72
75
include(CTest)
73
76
enable_testing()
74
77
 
75
 
# TODO: replace this with include(EnableCoverageReport) once the updated module makes it into the archives.
76
 
#       See https://code.launchpad.net/~michihenning/cmake-extras/cmake-extras-coverage/+merge/258021
77
 
include(XEnableCoverageReport)
 
78
include(EnableCoverageReport)
78
79
 
79
80
include(cmake/UseGSettings.cmake)
80
81
 
83
84
set(SHARE_PRIV_DIR ${CMAKE_INSTALL_LIBDIR}/thumbnailer)
84
85
set(SHARE_PRIV_ABS ${CMAKE_INSTALL_PREFIX}/${SHARE_PRIV_DIR})
85
86
 
86
 
find_package(Boost COMPONENTS filesystem system REQUIRED)
 
87
find_package(Boost COMPONENTS filesystem regex system REQUIRED)
87
88
find_package(Threads REQUIRED)
88
89
find_package(Qt5Core REQUIRED)
89
90
find_package(Qt5DBus REQUIRED)
90
91
 
91
92
include(FindPkgConfig)
92
93
pkg_check_modules(GST_DEPS REQUIRED gstreamer-1.0 gstreamer-plugins-base-1.0 gstreamer-tag-1.0)
 
94
pkg_check_modules(GOBJ_DEPS REQUIRED gobject-2.0)
93
95
pkg_check_modules(GIO_DEPS REQUIRED gio-2.0 gio-unix-2.0)
94
96
pkg_check_modules(IMG_DEPS REQUIRED gdk-pixbuf-2.0 libexif)
95
97
pkg_check_modules(UNITY_API_DEPS REQUIRED libunity-api)
 
98
pkg_check_modules(APPARMOR_DEPS REQUIRED libapparmor)
96
99
 
97
100
include_directories(${GST_DEPS_INCLUDE_DIRS})
 
101
include_directories(${GOBJ_DEPS_INCLUDE_DIRS})
98
102
include_directories(${GIO_DEPS_INCLUDE_DIRS})
99
103
include_directories(${IMG_DEPS_INCLUDE_DIRS})
100
104
include_directories(${UNITY_API_DEPS_INCLUDE_DIRS})
 
105
include_directories(${APPARMOR_DEPS_INCLUDE_DIRS})
101
106
include_directories(include)
102
107
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
103
108
 
105
110
add_subdirectory(data)
106
111
add_subdirectory(plugins/Ubuntu/Thumbnailer.0.1)
107
112
add_subdirectory(tests)
108
 
add_subdirectory(tools)
109
113
add_subdirectory(include)
110
114
 
111
 
# TODO: generate the list of test targets rather than enumerating them here.
112
 
#       We'll do this when we sort out the test subtree.
113
115
enable_coverage_report(
114
116
    TARGETS
115
117
        thumbnailer
 
118
        thumbnailer-admin
116
119
        thumbnailer-service
117
120
        thumbnailer-qml
118
121
        vs-thumb
120
123
    FILTER
121
124
        ${CMAKE_SOURCE_DIR}/include/core/*
122
125
        ${CMAKE_SOURCE_DIR}/tests/*
123
 
        ${CMAKE_SOURCE_DIR}/tools/*
124
126
        ${CMAKE_BINARY_DIR}/*
125
127
    TESTS
126
 
        cachetool
127
 
        downloaderstest
128
 
        downloadtest
129
 
        file_io
130
 
        gobj_ptr
131
 
        image
132
 
        safe_strerror_test
133
 
        test_dbus
134
 
        test_qml
135
 
        test_vsthumb
136
 
        thumbnailer_test
 
128
        ${UNIT_TEST_TARGETS}
137
129
)