← Back to branch summary

~compiz-team/compiz/compiz.fix_1063617.6

~compiz-team/compiz/compiz.fix_1063617.6

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/xorg-gtest/CMakeLists.txt

Committer: Sam Spilsbury
Date: 2012-12-07 06:09:18 UTC
mfrom: (3480.6.33 0.9.9)
Revision ID: sam.spilsbury@canonical.com-20121207060918-3xoqgnnhcx6rz2gb

Merge lp:compiz

files added:
tests/acceptance-tests

tests/acceptance-tests/CMakeLists.txt

tests/acceptance-tests/xorg-gtest

tests/acceptance-tests/xorg-gtest/CMakeLists.txt

tests/acceptance-tests/xorg-gtest/tests

tests/acceptance-tests/xorg-gtest/tests/CMakeLists.txt

tests/acceptance-tests/xorg-gtest/tests/README

tests/acceptance-tests/xorg-gtest/tests/compiz_acceptance_replace_current_wm.cpp

tests/shared/CMakeLists.txt

tests/shared/gtest_shared_asynctask.h

tests/shared/gtest_shared_tmpenv.h

tests/shared/src

tests/shared/src/CMakeLists.txt

tests/shared/src/gtest_shared_asynctask.cpp

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

files modified:
cmake/base.cmake

compizconfig/compizconfig-python/CMakeLists.txt

compizconfig/gconf/src/gconf.c

compizconfig/integration/gnome/src/ccs_gnome_integration.c

compizconfig/libcompizconfig/src/compiz.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp

compizconfig/libcompizconfig/tests/compizconfig_test_ccs_util.cpp

debian/changelog

gtk/gnome/CMakeLists.txt

include/core/screen.h

kde/window-decorator-kde4/window.cpp

plugins/animation/src/grid.cpp

plugins/composite/composite.xml.in

plugins/composite/src/screen.cpp

plugins/composite/src/window.cpp

plugins/cube/src/cube.cpp

plugins/cubeaddon/src/cubeaddon.cpp

plugins/decor/src/decor.cpp

plugins/expo/src/expo.cpp

plugins/fade/src/fade.cpp

plugins/firepaint/src/firepaint.cpp

plugins/group/src/selection.cpp

plugins/imgjpeg/src/imgjpeg.cpp

plugins/imgpng/src/imgpng.cpp

plugins/imgsvg/src/imgsvg.cpp

plugins/move/src/move.cpp

plugins/obs/src/obs.cpp

plugins/opengl/src/glxtfpbind/src/glx-tfp-bind.cpp

plugins/opengl/src/matrix.cpp

plugins/opengl/src/program.cpp

plugins/opengl/src/screen.cpp

plugins/opengl/src/vector.cpp

plugins/regex/src/regex.cpp

plugins/resize/src/logic/src/resize-logic.cpp

plugins/scale/src/scale.cpp

plugins/scaleaddon/src/scaleaddon.cpp

plugins/shift/src/shift.cpp

plugins/showmouse/src/showmouse.cpp

plugins/switcher/src/switcher.cpp

plugins/trailfocus/src/trailfocus.cpp

plugins/wall/src/wall.cpp

plugins/wobbly/src/wobbly.cpp

plugins/workspacenames/src/workspacenames.cpp

src/action.cpp

src/event.cpp

src/global.cpp

src/main.cpp

src/modifierhandler.cpp

src/option.cpp

src/screen.cpp

src/session.cpp

src/window.cpp

tests/CMakeLists.txt

tests/system/xorg-gtest/include/compiz-xorg-gtest.h

tests/system/xorg-gtest/src/compiz-xorg-gtest.cpp

tests/system/xorg-gtest/tests/CMakeLists.txt

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

Show diffs side-by-side

added added

removed removed

tests/acceptance-tests/xorg-gtest/CMakeLists.txt

1

if (BUILD_XORG_GTEST)

2

3

include_directories (${compiz_SOURCE_DIR}/tests/shared

4

${COMPIZ_XORG_SYSTEM_TEST_INCLUDE_DIR}

5

${X11_INCLUDE_DIRS}

6

${XORG_SERVER_INCLUDE_XORG_GTEST}

7

${XORG_SERVER_GTEST_SRC}

8

${GTEST_INCLUDE_DIRS})

9

add_subdirectory (tests)

10

11

endif (BUILD_XORG_GTEST)

Older »