Merge lp:~larryprice/libertine-scope/updated-cmake-extras into lp:libertine-scope/release

[Larry Price]

Update libertine-scope build for recent cmake-extras changes.

Update libertine-scope build for recent cmake-extras changes.

[Ken VanDine (ken-vandine)]

Builds now, thanks

review: Approve

=== modified file 'debian/rules'
--- debian/rules	2016-06-28 17:15:54 +0000
+++ debian/rules	2017-02-28 18:56:26 +0000
@@ -1,7 +1,4 @@
-#!/usr/bin/make -f 
+#!/usr/bin/make -f
 
 %:
 	dh $@
-
-override_dh_auto_build:
-	dh_auto_build -- all translations
 
=== modified file 'libertine-scope.apparmor'
--- libertine-scope.apparmor	2016-07-22 12:44:15 +0000
+++ libertine-scope.apparmor	2017-02-28 18:56:26 +0000
@@ -4,6 +4,7 @@
     "policy_version": 1.3,
     "read_path": [
         "@{HOME}/.local/share/libertine/",
+        "@{HOME}/.local/share/libertine-container/user-data/",
         "@{HOME}/.cache/libertine-container/",
         "@{CLICK_DIR}/*puritine*/"
     ],
 
=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2016-07-20 17:19:02 +0000
+++ po/CMakeLists.txt	2017-02-28 18:56:26 +0000
@@ -5,20 +5,16 @@
   GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
 )
 
-if (CLICK_MODE)
-  intltool_install_translations(
-    ALL
-    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
-  )
-else()
-  intltool_install_translations(
-    GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
-  )
-endif(CLICK_MODE)
+
+intltool_install_translations(
+  ALL
+  GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
+)
 
 file(GLOB_RECURSE ALL_POFILES "*.po")
 
 add_custom_target(potfiles
+  ALL
   SOURCES
     POTFILES.in.in
     ${GETTEXT_PACKAGE}.pot
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-07-28 20:12:03 +0000
+++ tests/CMakeLists.txt	2017-02-28 18:56:26 +0000
@@ -1,7 +1,4 @@
-# Build with system gmock and its embedded gtest -- the horror of hardcoding
-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
+find_package(GMock REQUIRED)
 
 function(create_test test_name)
   add_executable(${test_name}_exe
@@ -14,8 +11,7 @@
   target_link_libraries(${test_name}_exe
     apps
     Qt5::Core
-    gmock
-    gmock_main
+    gmock gmock_main
   )
 
   add_test(${test_name} ${test_name}_exe)