diff options
| author | Pete Woods <pete.woods@canonical.com> | 2017-01-09 14:19:36 +0000 |
|---|---|---|
| committer | Bileto Bot <ci-train-bot@canonical.com> | 2017-01-09 14:19:36 +0000 |
| commit | 71d13182414e699466dbe75786e430fbaf32e8f3 (patch) | |
| tree | 11de8c557336b545995c83293d3c241c9b61abe9 | |
| parent | 0dbe1c03ee413ac354d2702dc3d36925a5c0d301 (diff) | |
| parent | b79a89c19466c520d9fa2d241de84c9471ce59c7 (diff) | |
| download | ayatana-indicator-sound-71d13182414e699466dbe75786e430fbaf32e8f3.tar.gz ayatana-indicator-sound-71d13182414e699466dbe75786e430fbaf32e8f3.tar.bz2 ayatana-indicator-sound-71d13182414e699466dbe75786e430fbaf32e8f3.zip | |
Compatibility with unversioned cmake-extras modules (LP: #1563573)
| -rw-r--r-- | data/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | tests/integration/CMakeLists.txt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 9bee68b..50ed054 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -1,5 +1,5 @@ -include(UseGSettings) +find_package(GSettings) ########################### # Indicator service diff --git a/debian/control b/debian/control index 7358c87..dcae9f2 100644 --- a/debian/control +++ b/debian/control @@ -5,7 +5,7 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com> XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com> Build-Depends: debhelper (>= 9.0), cmake, - cmake-extras (>= 0.4), + cmake-extras (>= 0.10), dbus, dbus-test-runner (>> 14.04.0+14.04.20150120.1), dh-translations, diff --git a/tests/integration/CMakeLists.txt b/tests/integration/CMakeLists.txt index 939e329..62d6475 100644 --- a/tests/integration/CMakeLists.txt +++ b/tests/integration/CMakeLists.txt @@ -1,7 +1,7 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) -include(FindGMock) +find_package(GMock) #pkg_check_modules(GMENUHARNESS REQUIRED libgmenuharness REQUIRED) #include_directories(${GMENUHARNESS_INCLUDE_DIRS}) @@ -129,4 +129,4 @@ target_link_libraries( sound-indicator-dbus-interfaces ) -#add_subdirectory(utils)
\ No newline at end of file +#add_subdirectory(utils) |