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

Proposed by Larry Price on 2017-02-28
Status: Needs review
Proposed branch: lp:~larryprice/libertine-scope/cmake-extras-release
Merge into: lp:libertine-scope/release
Diff against target: 55 lines (+7/-18)
3 files modified
debian/rules (+1/-4)
po/CMakeLists.txt (+5/-10)
tests/CMakeLists.txt (+1/-4)
To merge this branch: bzr merge lp:~larryprice/libertine-scope/cmake-extras-release
Reviewer Review Type Date Requested Status
Libertine Developers 2017-02-28 Pending
Review via email: mp+318527@code.launchpad.net

Commit message

Update translations and gmock for recent breaking updates.

Description of the change

Update translations and gmock for recent breaking updates.

To post a comment you must log in.

Unmerged revisions

63. By Larry Price on 2017-02-28

Fixes for new cmake-extras.

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 19:24:40 +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 'po/CMakeLists.txt'
15--- po/CMakeLists.txt 2016-07-20 17:19:02 +0000
16+++ po/CMakeLists.txt 2017-02-28 19:24:40 +0000
17@@ -5,20 +5,15 @@
18 GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
19 )
20
21-if (CLICK_MODE)
22- intltool_install_translations(
23- ALL
24- GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
25- )
26-else()
27- intltool_install_translations(
28- GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
29- )
30-endif(CLICK_MODE)
31+intltool_install_translations(
32+ ALL
33+ GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
34+)
35
36 file(GLOB_RECURSE ALL_POFILES "*.po")
37
38 add_custom_target(potfiles
39+ ALL
40 SOURCES
41 POTFILES.in.in
42 ${GETTEXT_PACKAGE}.pot
43
44=== modified file 'tests/CMakeLists.txt'
45--- tests/CMakeLists.txt 2016-07-28 20:12:03 +0000
46+++ tests/CMakeLists.txt 2017-02-28 19:24:40 +0000
47@@ -1,7 +1,4 @@
48-# Build with system gmock and its embedded gtest -- the horror of hardcoding
49-set (GMOCK_SOURCE_DIR "/usr/src/gmock" CACHE PATH "gmock source directory")
50-set (GTEST_INCLUDE_DIR "${GMOCK_SOURCE_DIR}/gtest/include" CACHE PATH "gtest source include directory")
51-add_subdirectory(${GMOCK_SOURCE_DIR} "${CMAKE_CURRENT_BINARY_DIR}/gmock")
52+find_package(GMock REQUIRED)
53
54 function(create_test test_name)
55 add_executable(${test_name}_exe

Subscribers

People subscribed via source and target branches