diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-09-27 16:56:16 -0300 |
---|---|---|
committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-09-27 19:07:52 -0300 |
commit | 62234b4f86eea914b8bb802f5d5f3c110f5db92a (patch) | |
tree | 255ee2d7c3b243eb19ac3bb8693bb8b8fa2e81e4 /CMakeLists.txt | |
parent | 199b8b3baee2e3297413636a63ca09abe6aac39a (diff) |
Made the use of xvfb-run with QtGui tests optional.
To enable it run CMake with the USE_XVFB set to 1. Default is 0.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5c50500ad..76d12a2f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,11 +11,14 @@ find_package(GeneratorRunner 0.6 REQUIRED) find_package(Shiboken 0.5 REQUIRED) find_package(Qt4 4.5.0 REQUIRED) -find_program(XVFB_RUN NAMES xvfb-run) set(XVFB_EXEC "") -if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") - set(XVFB_EXEC ${XVFB_RUN}) - message("Using xvfb-run to perform QtGui tests.") +option(USE_XVFB "Uses xvfb-run with the unit tests to avoid QtGui tests popping windows on the screen." FALSE) +if(USE_XVFB) + find_program(XVFB_RUN NAMES xvfb-run) + if (NOT ${XVFB_RUN} MATCHES "XVFB_RUN-NOTFOUND") + set(XVFB_EXEC ${XVFB_RUN}) + message("Using xvfb-run to perform QtGui tests.") + endif() endif() option(ENABLE_VERSION_SUFFIX "Used to use current version in suffix to generated files. This is used to allow multiples versions installed simultaneous." FALSE) |