aboutsummaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-12-23 14:35:46 +0100
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-12-23 14:35:46 +0100
commitc0b4e9399cd68e10489108a3f50556b6d86727a4 (patch)
treef67ee5f85c29c732f9f73abbbab371c279b1caab /src/CMakeLists.txt
parentda78e6c75cab23d837cb4768efa3838ddb2286e7 (diff)
parent9da17031233db5f7961f3dd7be69c8a3bc13bb27 (diff)
downloadayatana-indicator-sound-c0b4e9399cd68e10489108a3f50556b6d86727a4.tar.gz
ayatana-indicator-sound-c0b4e9399cd68e10489108a3f50556b6d86727a4.tar.bz2
ayatana-indicator-sound-c0b4e9399cd68e10489108a3f50556b6d86727a4.zip
Conflicts resolved with restored branch
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6c621ae..73a270c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -207,5 +207,4 @@ install(
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/
)
-# Disable integration tests
-# add_subdirectory(gmenuharness)
+add_subdirectory(gmenuharness)