aboutsummaryrefslogtreecommitdiff
path: root/CMakeLists.txt
diff options
context:
space:
mode:
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt18
1 files changed, 11 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc8a639..53a3f7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,8 +40,9 @@ pkg_check_modules (SERVICE_DEPS REQUIRED
libedataserver-1.2>=3.5
libnotify>=0.7.6
url-dispatcher-1>=1
+ properties-cpp>=0.0.1
json-glib-1.0>=0.16.2)
-include_directories (${SERVICE_INCLUDE_DIRS})
+include_directories (SYSTEM ${SERVICE_DEPS_INCLUDE_DIRS})
pkg_check_modules (PANEL_DEPS
glib-2.0>=2.36
@@ -86,12 +87,14 @@ add_custom_target (cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
##
set (CC_WARNING_ARGS " -Wall -Wshadow -Wextra -Wunused -Wformat=2 -Wno-missing-field-initializers")
+set (CXX_WARNING_ARGS " -Wall -Wextra -pedantic -Wno-missing-field-initializers")
-include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src)
-include_directories (${CMAKE_CURRENT_BINARY_DIR}/src)
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/include)
+include_directories (${CMAKE_CURRENT_BINARY_DIR}/include)
# testing & coverage
if (${enable_tests})
+ pkg_check_modules (DBUSTEST REQUIRED dbustest-1>=14.04.0)
set (GTEST_SOURCE_DIR /usr/src/gtest/src)
set (GTEST_INCLUDE_DIR ${GTEST_SOURCE_DIR}/..)
set (GTEST_LIBS -lpthread)
@@ -102,16 +105,17 @@ if (${enable_tests})
endif ()
# actually build things
-add_subdirectory (src)
+add_subdirectory(include)
+add_subdirectory(src)
if (BUILD_PANEL)
add_subdirectory (panel-gnome)
endif ()
if (BUILD_UNITY_PANEL)
add_subdirectory (panel-unity)
endif ()
-add_subdirectory (data)
-add_subdirectory (po)
+add_subdirectory(data)
+add_subdirectory(po)
if (${enable_tests})
- add_subdirectory (tests)
+ add_subdirectory(tests)
endif ()