Merge lp:~dobey/cmake-extras/simpler-potfile into lp:cmake-extras

Proposed by dobey on 2017-02-22
Status: Merged
Approved by: dobey on 2017-02-28
Approved revision: 83
Merged at revision: 67
Proposed branch: lp:~dobey/cmake-extras/simpler-potfile
Merge into: lp:cmake-extras
Prerequisite: lp:~dobey/cmake-extras/it-append-file-globs
Diff against target: 24 lines (+2/-4)
1 file modified
src/Intltool/IntltoolConfig.cmake (+2/-4)
To merge this branch: bzr merge lp:~dobey/cmake-extras/simpler-potfile
Reviewer Review Type Date Requested Status
Pete Woods Approve on 2017-02-28
Charles Kerr (community) 2017-02-22 Approve on 2017-02-27
Review via email: mp+318030@code.launchpad.net

Commit message

Don't use the gettext unique target magic for pot files.

To post a comment you must log in.
Charles Kerr (charlesk) :
review: Approve
Pete Woods (pete-woods) wrote :

I guess we're making the assumption that valid filename characters are also valid target names. But even assuming that's true (which it likely is for most stuff we care about) it'd be nice to put it in quotes.

review: Needs Fixing
Pete Woods (pete-woods) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/Intltool/IntltoolConfig.cmake'
2--- src/Intltool/IntltoolConfig.cmake 2017-02-28 17:32:22 +0000
3+++ src/Intltool/IntltoolConfig.cmake 2017-02-28 17:32:22 +0000
4@@ -297,18 +297,16 @@
5 ${_PO_DIRECTORY}
6 )
7
8- _GETTEXT_GET_UNIQUE_TARGET_NAME(${_POT_FILE} _UNIQUE_TARGET_NAME)
9-
10 if(_ARG_ALL)
11 add_custom_target(
12- ${_UNIQUE_TARGET_NAME}
13+ "${_POT_FILE}"
14 ALL
15 DEPENDS
16 "${_PO_DIRECTORY}/${_POT_FILE}"
17 )
18 else()
19 add_custom_target(
20- ${_UNIQUE_TARGET_NAME}
21+ "${_POT_FILE}"
22 DEPENDS
23 "${_PO_DIRECTORY}/${_POT_FILE}"
24 )

Subscribers

People subscribed via source and target branches

to all changes: