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

[Daniel van Vugt]

Don't ever enter the subdir of a plugin that is disabled. (LP: #1049100)

Don't ever enter the subdir of a plugin that is disabled. (LP: #1049100)

[Sam Spilsbury (smspillaz)]

This will fix the bug for the lp:compiz case but won't work for plugins that compile standalone.

Then again, there's not a lot of point in having a standalone plugin you can disable. So +1 from me.

review: Approve

[jenkins (martin-mrazik+qa)]

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

review: Approve (continuous-integration)

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2012-09-03 07:19:30 +0000
+++ cmake/CompizCommon.cmake	2012-09-12 10:22:21 +0000
@@ -443,8 +443,12 @@
     )
 
     foreach (_plugin ${_plugins_in})
-        get_filename_component (_plugin_dir ${_plugin} PATH)
-        add_subdirectory (${folder}/${_plugin_dir})
+	get_filename_component (_plugin_dir ${_plugin} PATH)
+	string (TOUPPER ${_plugin_dir} _plugin_upper)
+	if (NOT COMPIZ_DISABLE_PLUGIN_${_plugin_upper})
+	    add_subdirectory (${folder}/${_plugin_dir})
+	    set (COMPIZ_ENABLED_PLUGIN_${_plugin_upper} Y CACHE INTERNAL "")
+	endif ()
     endforeach ()
 endmacro ()
 

=== modified file 'cmake/CompizPackage.cmake'
--- cmake/CompizPackage.cmake	2010-05-17 18:18:56 +0000
+++ cmake/CompizPackage.cmake	2012-09-12 10:22:21 +0000
@@ -67,7 +67,7 @@
 	string (TOUPPER ${_plugin_name} _PLUGIN)
 	compiz_format_string (${_plugin_name} 14 _plugin_name)
 
-	if (COMPIZ_DISABLE_PLUGIN_${_PLUGIN})
+	if (NOT COMPIZ_ENABLED_PLUGIN_${_PLUGIN})
 	    compiz_color_message ("  ${_plugin_name}: ${_escape}[1;34mDisabled${_escape}[0m")
 	else ()
 	    if (COMPIZ_${_PLUGIN}_BUILD)