Merge lp:~3v1n0/compiz/xorg-gtest-escape-quotes into lp:compiz/0.9.12

Proposed by Marco Trevisan (Treviño) on 2015-12-10
Status: Merged
Approved by: Andrea Azzarone on 2015-12-10
Approved revision: 3989
Merged at revision: 3989
Proposed branch: lp:~3v1n0/compiz/xorg-gtest-escape-quotes
Merge into: lp:compiz/0.9.12
Diff against target: 18 lines (+8/-0)
1 file modified
cmake/FindXorgGTest.cmake (+8/-0)
To merge this branch: bzr merge lp:~3v1n0/compiz/xorg-gtest-escape-quotes
Reviewer Review Type Date Requested Status
Andrea Azzarone 2015-12-10 Approve on 2015-12-10
Review via email: mp+280158@code.launchpad.net

Commit message

FindXorgGTest: escape unscaped quotes on pkg-config variables

To post a comment you must log in.
Andrea Azzarone (azzar1) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/FindXorgGTest.cmake'
2--- cmake/FindXorgGTest.cmake 2013-02-13 11:37:51 +0000
3+++ cmake/FindXorgGTest.cmake 2015-12-10 15:21:35 +0000
4@@ -23,6 +23,14 @@
5 string (STRIP ${_xorg_gtest_source_dir} _xorg_gtest_source_dir)
6 string (STRIP ${_xorg_gtest_cflags} _xorg_gtest_cflags)
7
8+ # This is a workaround for bug #1521366 caused by recent pkg-config variables unquoting
9+ set (_unescaped_double_quote "([^\\])\\\"")
10+ set (_escaped_double_quote "\\1\\\\\"")
11+ string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_prefix ${_xorg_gtest_prefix})
12+ string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_include_dir ${_xorg_gtest_include_dir})
13+ string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_source_dir ${_xorg_gtest_source_dir})
14+ string (REGEX REPLACE ${_unescaped_double_quote} ${_escaped_double_quote} _xorg_gtest_cflags ${_xorg_gtest_cflags})
15+
16 set (XORG_SERVER_GTEST_INCLUDES ${XORG_SERVER_INCLUDE_DIRS})
17 set (XORG_SERVER_GTEST_LIBRARY_DIRS ${XORG_SERVER_LIBRARIES})
18 set (XORG_SERVER_GTEST_LIBRARIES} ${XORG_SERVER_LIBRARIES})

Subscribers

People subscribed via source and target branches