Merge lp:~dobey/cmake-extras/it-append-file-globs into lp:cmake-extras

Proposed by dobey on 2017-02-22
Status: Merged
Approved by: Charles Kerr on 2017-02-27
Approved revision: 81
Merged at revision: 66
Proposed branch: lp:~dobey/cmake-extras/it-append-file-globs
Merge into: lp:cmake-extras
Prerequisite: lp:~dobey/cmake-extras/fix-intltool-merge
Diff against target: 25 lines (+2/-2)
2 files modified
examples/intltool-demo/po/CMakeLists.txt (+1/-1)
src/Intltool/IntltoolConfig.cmake (+1/-1)
To merge this branch: bzr merge lp:~dobey/cmake-extras/it-append-file-globs
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+318024@code.launchpad.net

Commit message

Append file globs rather than resetting the variable.

To post a comment you must log in.
Charles Kerr (charlesk) wrote :

LGTM.

review: Approve
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 'examples/intltool-demo/po/CMakeLists.txt'
2--- examples/intltool-demo/po/CMakeLists.txt 2017-02-22 20:09:24 +0000
3+++ examples/intltool-demo/po/CMakeLists.txt 2017-02-22 20:09:24 +0000
4@@ -4,7 +4,7 @@
5 POTFILES_TEMPLATE "POTFILES.in.in"
6 GETTEXT_PACKAGE ${GETTEXT_PACKAGE}
7 COPYRIGHT_HOLDER "Foocorp Ltd."
8- FILE_GLOBS "${CMAKE_SOURCE_DIR}/*.gschema.xml.in" "${CMAKE_SOURCE_DIR}/*.ini.in" "${CMAKE_SOURCE_DIR}/*.cpp" "${CMAKE_SOURCE_DIR}/*.h" "${CMAKE_SOURCE_DIR}/*.c"
9+ FILE_GLOBS "${CMAKE_SOURCE_DIR}/*.gschema.xml.in"
10 FILTER ".*test.*"
11 )
12
13
14=== modified file 'src/Intltool/IntltoolConfig.cmake'
15--- src/Intltool/IntltoolConfig.cmake 2017-02-22 20:09:24 +0000
16+++ src/Intltool/IntltoolConfig.cmake 2017-02-22 20:09:24 +0000
17@@ -236,7 +236,7 @@
18 endif()
19
20 if(_ARG_FILE_GLOBS)
21- set(_FILE_GLOBS ${_ARG_FILE_GLOBS})
22+ list(APPEND _FILE_GLOBS ${_ARG_FILE_GLOBS})
23 endif()
24
25 file(

Subscribers

People subscribed via source and target branches

to all changes: