CMake Extras

Merge lp:~pete-woods/cmake-extras/fix-no-copyrght-holders-causes-error into lp:cmake-extras

  1. fix-no-copyrght-holders-causes-error
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Pete Woods
Approved revision: 28
Merged at revision: 28
Proposed branch: lp:~pete-woods/cmake-extras/fix-no-copyrght-holders-causes-error
Merge into: lp:cmake-extras
Diff against target: 16 lines (+2/-2)
1 file modified
src/FindIntltool.cmake (+2/-2)
To merge this branch: bzr merge lp:~pete-woods/cmake-extras/fix-no-copyrght-holders-causes-error
Reviewer Review Type Date Requested Status
CMake Extras Pending
Review via email: mp+271482@code.launchpad.net

Commit message

Fix failure when no COPYRIGHT_HOLDER argument provided

Description of the change

Fix failure when no COPYRIGHT_HOLDER argument provided

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/FindIntltool.cmake'
--- src/FindIntltool.cmake 2015-06-22 08:46:03 +0000
+++ src/FindIntltool.cmake 2015-09-17 13:58:21 +0000
@@ -182,10 +182,10 @@
182 endif()182 endif()
183183
184 if(_ARG_KEYWORDS)184 if(_ARG_KEYWORDS)
185 _write_intltool_makefile_in(${_PO_DIRECTORY} _ARG_KEYWORDS ${_ARG_COPYRIGHT_HOLDER})185 _write_intltool_makefile_in(${_PO_DIRECTORY} _ARG_KEYWORDS "${_ARG_COPYRIGHT_HOLDER}")
186 elseif(_ARG_UBUNTU_SDK_DEFAULTS)186 elseif(_ARG_UBUNTU_SDK_DEFAULTS)
187 set(_UBUNTU_SDK_DEFAULT_KEYWORDS "tr" "tr:1,2" "dtr:2" "dtr:2,3" "N_")187 set(_UBUNTU_SDK_DEFAULT_KEYWORDS "tr" "tr:1,2" "dtr:2" "dtr:2,3" "N_")
188 _write_intltool_makefile_in(${_PO_DIRECTORY} _UBUNTU_SDK_DEFAULT_KEYWORDS ${_ARG_COPYRIGHT_HOLDER})188 _write_intltool_makefile_in(${_PO_DIRECTORY} _UBUNTU_SDK_DEFAULT_KEYWORDS "${_ARG_COPYRIGHT_HOLDER}")
189 endif()189 endif()
190 190
191 set(_FILE_GLOBS191 set(_FILE_GLOBS

Subscribers

People subscribed via source and target branches

to all changes: