Merge lp:~marcustomlinson/unity-js-scopes/lp-1538419 into lp:unity-js-scopes

Proposed by Marcus Tomlinson
Status: Merged
Approved by: Alexandre Abreu
Approved revision: 125
Merged at revision: 125
Proposed branch: lp:~marcustomlinson/unity-js-scopes/lp-1538419
Merge into: lp:unity-js-scopes
Diff against target: 18 lines (+1/-1)
1 file modified
qtc-templates/scope-js/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~marcustomlinson/unity-js-scopes/lp-1538419
Reviewer Review Type Date Requested Status
Alexandre Abreu (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+284066@code.launchpad.net

Commit message

Don't expect .pot file to exist, this breaks CMake when no translations are present

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Alexandre Abreu (abreu-alexandre) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qtc-templates/scope-js/CMakeLists.txt'
2--- qtc-templates/scope-js/CMakeLists.txt 2015-10-22 05:41:05 +0000
3+++ qtc-templates/scope-js/CMakeLists.txt 2016-01-27 07:46:20 +0000
4@@ -35,6 +35,7 @@
5 file(GLOB_RECURSE
6 _PO_JS_FILES
7 "po/*.po"
8+ "po/*.pot"
9 "*.js"
10 )
11 add_custom_target(hidden_files
12@@ -45,7 +46,6 @@
13 src/data/%ClickHookName:l%.ini.in
14 src/data/%ClickHookName:l%-settings.ini.in
15 po/POTFILES.in.in
16- po/${GETTEXT_PACKAGE}.pot
17 ${_PO_JS_FILES}
18 )
19

Subscribers

People subscribed via source and target branches

to all changes: