aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-08 13:25:19 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-08 13:25:19 +0100
commitd314b1f0803814a0ee2bdb0f2a8ac00c3c436028 (patch)
tree2c1bf631521c262dabf62ea40de2f68466612890 /tests
parentac17f89c00a37a7e433426d8e365e319307b2dbf (diff)
parent05ab8abf81faa7580bf9e50ffc4669be0b1679f4 (diff)
downloadayatana-indicator-sound-d314b1f0803814a0ee2bdb0f2a8ac00c3c436028.tar.gz
ayatana-indicator-sound-d314b1f0803814a0ee2bdb0f2a8ac00c3c436028.tar.bz2
ayatana-indicator-sound-d314b1f0803814a0ee2bdb0f2a8ac00c3c436028.zip
Merge branch 'tari01-pr/drop-gmenuharness'
Attributes GH PR #56; https://github.com/AyatanaIndicators/ayatana-indicator-sound/pull/56
Diffstat (limited to 'tests')
-rw-r--r--tests/integration/CMakeLists.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt
index 8193341..a21ce0e 100644
--- a/tests/integration/CMakeLists.txt
+++ b/tests/integration/CMakeLists.txt
@@ -1,9 +1,10 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
-#pkg_check_modules(GMENUHARNESS REQUIRED libgmenuharness REQUIRED)
-#include_directories(${GMENUHARNESS_INCLUDE_DIRS})
-include_directories("${CMAKE_SOURCE_DIR}/include")
+if(LOMIRI_API_FOUND)
+ pkg_check_modules(GMENUHARNESS REQUIRED libgmenuharness REQUIRED)
+ include_directories(${GMENUHARNESS_INCLUDE_DIRS})
+endif()
pkg_check_modules(QTDBUSTEST REQUIRED libqtdbustest-1 REQUIRED)
include_directories(${QTDBUSTEST_INCLUDE_DIRS})
@@ -82,9 +83,8 @@ target_link_libraries(
${QTDBUSMOCK_LDFLAGS}
${QTDBUSTEST_LDFLAGS}
${GMOCK_LIBRARIES}
-# ${GMENUHARNESS_LDFLAGS}
+ ${GMENUHARNESS_LDFLAGS}
${GLIB_LDFLAGS}
- gmenuharness-shared
)
add_test(