Merge lp:~vanvugt/compiz/fix-1023738 into lp:compiz/0.9.8

[Daniel van Vugt]

Fix build failure due to invalid sed expression that would be generated
by shell expansion of ";;" to " ". (LP: #1023738)

Fix build failure due to invalid sed expression that would be generated
by shell expansion of ";;" to " ". (LP: #1023738)

[jenkins (martin-mrazik+qa)]

PASSED: Continuous integration, rev:3285
http://jenkins.qa.ubuntu.com/job/compiz-ci/9/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=amd64/9/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./distribution=quantal,flavor=i386/9/console

review: Approve (continuous-integration)

[Sam Spilsbury (smspillaz)]

This is fine, however I think using VERBATIM is the preferred way of handling this issue in CMake:

http://cmake.org/cmake/help/v2.8.8/cmake.html#command:add_custom_command

14 add_custom_command (
15 OUTPUT ${_dst}
16 COMMAND cat ${_src} |
17 sed -e 's;^_;;g' >
19 ${_dst}
20 DEPENDS ${_src}
                    VERBATIM
21 )

If that works, then I'd go with using VERBATIM, otherwise:

review: Approve

[Daniel van Vugt (vanvugt)]

It might just be a shell quoting problem...

     COMMAND "cat ${_src} | sed -e 's;^_;;g' > ${_dst}"

[Sam Spilsbury (smspillaz)]

review: Approve

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2012-07-05 00:21:48 +0000
+++ cmake/CompizCommon.cmake	2012-07-16 05:45:25 +0000
@@ -337,6 +337,7 @@
 		    sed -e 's;<_;<;g' -e 's;</_;</;g' > 
 		    ${_dst}
 	    DEPENDS ${_src}
+	    VERBATIM
 	)
     endif ()
 endfunction ()
@@ -364,6 +365,7 @@
 		    sed -e 's;^_;;g' >
 		    ${_dst}
 	    DEPENDS ${_src}
+	    VERBATIM
 	)
     endif ()
 endfunction ()