Merge lp:~kalikiana/u1db-qt/makecheck into lp:u1db-qt

[Cris Dywan]

Move enable_testing back to toplevel, otherwise it quietly does nothing

Move enable_testing back to toplevel, otherwise it quietly does nothing

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:82
http://91.189.93.125:8080/job/u1db-qt-ci/22/
Executed test runs:
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/22
    SUCCESS: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/22

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/22/rebuild

review: Approve (continuous-integration)

[Cris Dywan (kalikiana)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-04-23 10:39:54 +0000
+++ CMakeLists.txt	2013-04-24 09:10:36 +0000
@@ -19,6 +19,7 @@
 add_definitions(-DQT_NO_KEYWORDS)
 
 add_subdirectory(src)
+enable_testing()
 add_subdirectory(tests)
 add_subdirectory(modules)
 add_subdirectory(examples)
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-04-23 11:16:30 +0000
+++ tests/CMakeLists.txt	2013-04-24 09:10:36 +0000
@@ -1,4 +1,3 @@
-enable_testing()
 add_custom_target(check COMMAND "env" "CTEST_OUTPUT_ON_FAILURE=1" "${CMAKE_CTEST_COMMAND}")
 
 find_package(Qt5Test REQUIRED)