Merge lp:~vanvugt/compiz/fix-1083027 into lp:compiz/0.9.9

[Daniel van Vugt]

Be sure to treat \r and \n as word boundaries too. Otherwise CMake will read
expo's plugin name as "expo\n" from plugins/expo/CMakeLists.txt resulting
in weird and misleading "Disabled" messages for expo.
(LP: #1083027)

[Sam Spilsbury (smspillaz)]

Yay regex.

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3541
http://jenkins.qa.ubuntu.com/job/compiz-ci/348/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/348/console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/compiz-ci/348//rebuild/?

review: Approve (continuous-integration)

=== modified file 'cmake/CompizPackage.cmake'
--- cmake/CompizPackage.cmake	2012-09-12 10:19:47 +0000
+++ cmake/CompizPackage.cmake	2013-01-07 08:10:26 +0000
@@ -54,10 +54,10 @@
     )
     foreach (_plugin ${_plugins_in})
 	file (READ "${_folder}/${_plugin}" _file)
-	if (_file MATCHES "^.*compiz_plugin ?\\(([^\\) ]*).*$")
+	if (_file MATCHES "^.*compiz_plugin ?\\(([^\\)\r\n ]*).*$")
 	    string (
 		REGEX REPLACE
-		"^.*compiz_plugin ?\\(([^\\) ]*).*$" "\\1"
+		"^.*compiz_plugin ?\\(([^\\)\r\n ]*).*$" "\\1"
 		_plugin_name ${_file}
 	    )
 	else ()