Libertine Scope

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

  1. updated-cmake-extras
  2. Merge into release
Proposed by Larry Price
Status: Merged
Approved by: Larry Price
Approved revision: 67
Merged at revision: 63
Proposed branch: lp:~larryprice/libertine-scope/updated-cmake-extras
Merge into: lp:libertine-scope/release
Diff against target: 78 lines (+10/-20)
4 files modified
debian/rules (+1/-4)
libertine-scope.apparmor (+1/-0)
po/CMakeLists.txt (+6/-10)
tests/CMakeLists.txt (+2/-6)
To merge this branch: bzr merge lp:~larryprice/libertine-scope/updated-cmake-extras
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+318523@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Builds now, thanks

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/rules'
2--- debian/rules 2016-06-28 17:15:54 +0000
3+++ debian/rules 2017-02-28 18:56:26 +0000
4@@ -1,7 +1,4 @@
5-#!/usr/bin/make -f
6+#!/usr/bin/make -f
7
8 %:
9 dh $@
10-
11-override_dh_auto_build:
12- dh_auto_build -- all translations
13
14=== modified file 'libertine-scope.apparmor'
15--- libertine-scope.apparmor 2016-07-22 12:44:15 +0000
16+++ libertine-scope.apparmor 2017-02-28 18:56:26 +0000
17@@ -4,6 +4,7 @@
18 "policy_version": 1.3,
19 "read_path": [
20 "@{HOME}/.local/share/libertine/",
21+ "@{HOME}/.local/share/libertine-container/user-data/",
22 "@{HOME}/.cache/libertine-container/",
23 "@{CLICK_DIR}/*puritine*/"
24 ],
25
26=== modified file 'po/CMakeLists.txt'
27--- po/CMakeLists.txt 2016-07-20 17:19:02 +0000
28+++ po/CMakeLists.txt 2017-02-28 18:56:26 +0000
29@@ -5,20 +5,16 @@
30 GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
31 )
32
33-if (CLICK_MODE)
34- intltool_install_translations(
35- ALL
36- GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
37- )
38-else()
39- intltool_install_translations(
40- GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
41- )
42-endif(CLICK_MODE)
43+
44+intltool_install_translations(
45+ ALL
46+ GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
47+)
48
49 file(GLOB_RECURSE ALL_POFILES "*.po")
50
51 add_custom_target(potfiles
52+ ALL
53 SOURCES
54 POTFILES.in.in
55 ${GETTEXT_PACKAGE}.pot
56
57=== modified file 'tests/CMakeLists.txt'
58--- tests/CMakeLists.txt 2016-07-28 20:12:03 +0000
59+++ tests/CMakeLists.txt 2017-02-28 18:56:26 +0000
60@@ -1,7 +1,4 @@
61-# Build with system gmock and its embedded gtest -- the horror of hardcoding
62-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
63-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
64-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
65+find_package(GMock REQUIRED)
66
67 function(create_test test_name)
68 add_executable(${test_name}_exe
69@@ -14,8 +11,7 @@
70 target_link_libraries(${test_name}_exe
71 apps
72 Qt5::Core
73- gmock
74- gmock_main
75+ gmock gmock_main
76 )
77
78 add_test(${test_name} ${test_name}_exe)

Subscribers

People subscribed via source and target branches