aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt2
-rw-r--r--debian/control15
-rw-r--r--src/main.cpp1
-rw-r--r--tests/CMakeLists.txt5
-rw-r--r--tests/test-hello-world.cpp2
5 files changed, 16 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7634bac..02ecacb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,8 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
set (PROJECT_VERSION "14.10.0")
set (PACKAGE ${CMAKE_PROJECT_NAME})
set (GETTEXT_PACKAGE indicator-display)
+add_definitions (-DGETTEXT_PACKAGE="${GETTEXT_PACKAGE}"
+ -DGNOMELOCALEDIR="${CMAKE_INSTALL_FULL_LOCALEDIR}")
set (SERVICE_LIB ${PACKAGE})
set (SERVICE_EXEC "${PACKAGE}-service")
diff --git a/debian/control b/debian/control
index e174f31..fe33f52 100644
--- a/debian/control
+++ b/debian/control
@@ -2,16 +2,21 @@ Source: indicator-display
Section: misc
Priority: optional
Maintainer: Charles Kerr <charles.kerr@canonical.com>
-# make g++ version explicit for ABI safety <https://wiki.ubuntu.com/cpp-11>
Build-Depends: cmake,
dbus,
+# make g++ version explicit for ABI safety <https://wiki.ubuntu.com/cpp-11>
g++-4.9,
- debhelper (>= 9),
- dh-translations,
- intltool (>= 0.35.0),
libglib2.0-dev (>= 2.36),
+ liburl-dispatcher1-deva
+# for coverage reports
+ lcov,
+# for tests
+ cppcheck,
libgtest-dev,
- liburl-dispatcher1-dev,
+ google-mock (>= 1.6.0+svn437),
+# for packaging
+ debhelper (>= 9),
+ dh-translations,
Standards-Version: 3.9.4
Homepage: http://launchpad.net/indicator-display/
# If you aren't a member of ~indicator-applet-developers but need to upload
diff --git a/src/main.cpp b/src/main.cpp
index f3b5392..5cd3581 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -42,6 +42,7 @@ main(int /*argc*/, char** /*argv*/)
// auto controller = std::make_shared<Controller>(model, world);
// GMenuView menu_view (model, controller);
// FIXME: listen for busname-lost
+ g_message("entering GMainLoop that does nothing! Woo!");
g_main_loop_run(loop);
// cleanup
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a2491b6..38c315c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -26,9 +26,8 @@ function(add_test_by_name name)
set (TEST_NAME ${name})
add_executable (${TEST_NAME} ${TEST_NAME}.cpp)
add_test (${TEST_NAME} ${TEST_NAME})
- add_dependencies (${TEST_NAME} libindicatortransferservice)
- #target_link_libraries (${TEST_NAME} indicatortransferservice gtest ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBS})
- target_link_libraries (${TEST_NAME} indicatortransferservice ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
+ add_dependencies (${TEST_NAME} libindicatordisplayservice)
+ target_link_libraries (${TEST_NAME} indicatordisplayservice ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES})
endfunction()
add_test_by_name(test-hello-world)
diff --git a/tests/test-hello-world.cpp b/tests/test-hello-world.cpp
index 53d2ec3..5d9c308 100644
--- a/tests/test-hello-world.cpp
+++ b/tests/test-hello-world.cpp
@@ -43,6 +43,6 @@ protected:
TEST_F(HelloWorldFixture, HelloWorld)
{
- EXPECT_TRUE(true)
+ EXPECT_TRUE(true);
}