diff options
author | Charles Kerr <charles.kerr@canonical.com> | 2016-03-11 14:06:34 -0600 |
---|---|---|
committer | Charles Kerr <charles.kerr@canonical.com> | 2016-03-11 14:06:34 -0600 |
commit | 0734731e7296f84ab30ac403886635b7cb89da49 (patch) | |
tree | 2ce36bf6cd59e8e2e5165a8be59e0c0ab7222f7b /CMakeLists.txt | |
parent | d8ef8e68805ab7f53258427c79ee5aaafec916ba (diff) | |
download | ayatana-indicator-display-0734731e7296f84ab30ac403886635b7cb89da49.tar.gz ayatana-indicator-display-0734731e7296f84ab30ac403886635b7cb89da49.tar.bz2 ayatana-indicator-display-0734731e7296f84ab30ac403886635b7cb89da49.zip |
clean up compile_options and warnings. Add DBUS debug log messages to ctest environment variables.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5110c9e..3230a2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,7 @@ option(enable_lcov "Generate lcov code coverage reports." ON) ## ## GNU standard paths ## + include(GNUInstallDirs) if(EXISTS "/etc/debian_version") # Workaround for libexecdir on debian set(CMAKE_INSTALL_LIBEXECDIR "${CMAKE_INSTALL_LIBDIR}") @@ -35,32 +36,34 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) find_package(PkgConfig REQUIRED) +set(GLIB_MINIMUM 2.36) pkg_check_modules(SERVICE_DEPS REQUIRED - gio-unix-2.0>=2.36 - glib-2.0>=2.36 + gio-unix-2.0>=${GLIB_MINIMUM} + glib-2.0>=${GLIB_MINIMUM} ) include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS} ) ## -## +## Compiler settings ## -set (CMAKE_INCLUDE_CURRENT_DIR OFF) -include_directories (${CMAKE_CURRENT_SOURCE_DIR}) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}) # set the compiler warnings if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CXX_WARNING_ARGS "${CXX_WARNING_ARGS} -Weverything -Wno-c++98-compat -Wno-padded") -else() - set(CXX_WARNING_ARGS "${CXX_WARNING_ARGS} -Wall -Wextra -Wpedantic") + list(APPEND CXX_WARNING_ARGS -Weverything -Wno-c++98-compat -Wno-padded) +elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + list(APPEND CXX_WARNING_ARGS -Wall -Wextra -Wpedantic) endif() -set(CXX_WARNING_ARGS "${CXX_WARNING_ARGS} -Wno-missing-field-initializers") # GActionEntry -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -fPIC -g") +add_compile_options(-std=c++14 -fPIC -g) + +## +## Testing & Coverage +## -# testing & coverage if(${enable_tests}) enable_testing() if(${enable_lcov}) |