diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2016-03-08 22:04:56 -0600 |
|---|---|---|
| committer | Charles Kerr <charles.kerr@canonical.com> | 2016-03-08 22:04:56 -0600 |
| commit | 68b671ce04b8b5d6b37025ad093c73a3e14d4d64 (patch) | |
| tree | 1b9d1dca5587219915115c8ccd702cfa6f5fd045 /CMakeLists.txt | |
| parent | 40f48471fe531ba5b9f1e1c4371f252fca4c2d52 (diff) | |
| download | ayatana-indicator-display-68b671ce04b8b5d6b37025ad093c73a3e14d4d64.tar.gz ayatana-indicator-display-68b671ce04b8b5d6b37025ad093c73a3e14d4d64.tar.bz2 ayatana-indicator-display-68b671ce04b8b5d6b37025ad093c73a3e14d4d64.zip | |
add fingerprint snap decisions; test with notification dbusmock
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9fa4d10..8b8ef65 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -project (indicator-display) -cmake_minimum_required (VERSION 2.8.9) +project(indicator-display LANGUAGES C CXX) +cmake_minimum_required(VERSION 2.8.9) list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) @@ -15,9 +15,6 @@ set (SERVICE_EXEC "${PACKAGE}-service") option (enable_tests "Build the package's automatic tests." ON) option (enable_lcov "Generate lcov code coverage reports." ON) -set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) - ## ## GNU standard paths ## @@ -33,9 +30,10 @@ set (CMAKE_INSTALL_FULL_PKGLIBEXECDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/${CMAKE_ ## Check for prerequisites ## +set(THREADS_PREFER_PTHREAD_FLAG ON) +find_package(Threads REQUIRED) find_package (PkgConfig REQUIRED) -include (FindPkgConfig) pkg_check_modules (SERVICE_DEPS REQUIRED gio-unix-2.0>=2.36 glib-2.0>=2.36) @@ -58,9 +56,6 @@ set (CXX_WARNING_ARGS "${CXX_WARNING_ARGS} -Wno-missing-field-initializers") # G # testing & coverage if (${enable_tests}) - set (GTEST_SOURCE_DIR /usr/src/gtest/src) - set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..) - set (GTEST_LIBS -lpthread) enable_testing () if (${enable_lcov}) include(GCov) |