← Back to branch summary

~mc-return/compiz/compiz.merge-revert-wrong-commit

~mc-return/compiz/compiz.merge-revert-wrong-commit

« back to all changes in this revision

Viewing changes to plugins/CMakeLists.txt

Committer: MC Return
Date: 2013-03-24 10:28:22 UTC
mfrom: (3626.1.9 0.9.9)
Revision ID: mc.return@gmx.net-20130324102822-gq53d55mcx69ddd0

Merged latest lp:compiz

files added:
debian/patches/ubuntu_super_p.patch

plugins/freewins

plugins/freewins/AUTHORS

plugins/freewins/CMakeLists.txt

plugins/freewins/COPYING

plugins/freewins/freewins.xml.in

plugins/freewins/src

plugins/freewins/src/action.cpp

plugins/freewins/src/events.cpp

plugins/freewins/src/freewins.cpp

plugins/freewins/src/freewins.h

plugins/freewins/src/input.cpp

plugins/freewins/src/paint.cpp

plugins/freewins/src/util.cpp

files modified:
CMakeLists.txt

compizconfig/compizconfig-python/CMakeLists.txt

compizconfig/libcompizconfig/src/compiz.cpp

compizconfig/tests/compizconfig_ccs_setting_value_operators.cpp

debian/changelog

debian/compiz-plugins.install

debian/patches/series

plugins/CMakeLists.txt

plugins/animation/src/animation.cpp

plugins/animation/src/curvedfold.cpp

plugins/animation/src/dodge.cpp

plugins/animation/src/dream.cpp

plugins/animation/src/extensionplugin.cpp

plugins/animation/src/fade.cpp

plugins/animation/src/focusfade.cpp

plugins/animation/src/glide.cpp

plugins/animation/src/grid.cpp

plugins/animation/src/horizontalfold.cpp

plugins/animation/src/magiclamp.cpp

plugins/animation/src/options.cpp

plugins/animation/src/restack.cpp

plugins/animation/src/rollup.cpp

plugins/animation/src/wave.cpp

plugins/animation/src/zoomside.cpp

plugins/animationaddon/src/airplane.cpp

plugins/animationaddon/src/animationaddon.cpp

plugins/animationaddon/src/beamup.cpp

plugins/animationaddon/src/burn.cpp

plugins/animationaddon/src/domino.cpp

plugins/animationaddon/src/explode.cpp

plugins/animationaddon/src/fold.cpp

plugins/animationaddon/src/glide3.cpp

plugins/animationaddon/src/leafspread.cpp

plugins/animationaddon/src/particle.cpp

plugins/animationaddon/src/polygon.cpp

plugins/animationaddon/src/skewer.cpp

plugins/bench/src/bench.cpp

plugins/cubeaddon/src/cubeaddon.cpp

plugins/decor/src/decor.cpp

plugins/decor/src/decor.h

plugins/expo/src/expo.cpp

plugins/firepaint/src/firepaint.cpp

plugins/firepaint/src/firepaint.h

plugins/grid/src/grid.cpp

plugins/group/src/group.h

plugins/imgjpeg/src/imgjpeg.cpp

plugins/mag/src/mag.cpp

plugins/mousepoll/src/mousepoll.cpp

plugins/resizeinfo/src/resizeinfo.cpp

plugins/scalefilter/src/scalefilter.cpp

plugins/session/src/session.cpp

plugins/showmouse/src/showmouse.cpp

plugins/showmouse/src/showmouse.h

plugins/text/src/text.cpp

plugins/trip/src/trip.cpp

plugins/wall/src/offset_movement/src/offset-movement.cpp

plugins/widget/src/widget.cpp

src/pluginclasshandler/include/core/pluginclasshandler.h

src/privatewindow.h

src/timer/tests/set-values/src/test-timer-set-values.cpp

src/window.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_configure_window.cpp

tests/system/xorg-gtest/tests/compiz_xorg_gtest_test_window_stacking.cpp

Show diffs side-by-side

added added

removed removed

plugins/CMakeLists.txt

23

23

# disable plugins which won't work on ES2 builds

24

24

if (BUILD_GLES)

25

25

26

set (COMPIZ_DISABLE_PLUGIN_FREEWINS ON)

26

27

set (COMPIZ_DISABLE_PLUGIN_GEARS ON)

27

28

set (COMPIZ_DISABLE_PLUGIN_TD ON)

28

29

set (COMPIZ_DISABLE_PLUGIN_COLORFILTER ON)

Older »