diff options
| author | Robin Burchell <robin.burchell@collabora.co.uk> | 2010-09-09 22:01:47 +1000 |
|---|---|---|
| committer | Miroslav Safr <miroslav.safr@tieto.com> | 2010-09-14 16:24:30 +0300 |
| commit | 2c4ef92750a9922e7fdd17f0ec3ff6660a329020 (patch) | |
| tree | d52f319a4eef1f23f41c4a5bf435f6024773fe47 /mthemedaemon/benchmark | |
| parent | 85c4bbb65cab63b8e7cb464f45a0197affa6d1d1 (diff) | |
Changes: Build system fixes to allow building without GConf.
Details: configure notes libgconf as an optional dependency, yet a number of
parts of the build system did not check DEFINES for USE_GCONF before building
gconf-related code, meaning it effectively *wasn't* optional.
Diffstat (limited to 'mthemedaemon/benchmark')
| -rw-r--r-- | mthemedaemon/benchmark/benchmark.pro | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/mthemedaemon/benchmark/benchmark.pro b/mthemedaemon/benchmark/benchmark.pro index 7150ee54..0efab408 100644 --- a/mthemedaemon/benchmark/benchmark.pro +++ b/mthemedaemon/benchmark/benchmark.pro @@ -21,8 +21,6 @@ QT += svg \ # Check for mixing of const and non-const iterators, # which can cause problems when built with some compilers: DEFINES += QT_STRICT_ITERATORS -!win32:CONFIG += link_pkgconfig -PKGCONFIG += gconf-2.0 # Input SOURCES += benchmarkremoteclient.cpp \ @@ -32,13 +30,21 @@ SOURCES += benchmarkremoteclient.cpp \ ../../src/corelib/theme/mthemedaemonclient.cpp \ ../../src/corelib/theme/mthemedaemonprotocol.cpp \ ../../src/corelib/theme/mthemeresourcemanager.cpp \ - ../../src/corelib/core/mgconfitem.cpp \ ../../src/corelib/core/mcpumonitor.cpp \ main.cpp \ benchmarklocalclient.cpp \ common.cpp \ ../../src/corelib/theme/mlocalthemedaemon.cpp +contains(DEFINES, HAVE_GCONF) { + SOURCES += ../../src/corelib/core/mgconfitem.cpp + + CONFIG += link_pkgconfig + PKGCONFIG += gconf-2.0 +} else { + SOURCES += ../../src/corelib/core/mgconfitem_stub.cpp +} + HEADERS += benchmarkremoteclient.h \ ../../src/corelib/theme/imthemedaemon.h \ ../../src/corelib/theme/mthemedaemon.h \ |