diff options
| author | Allen Winter <winter@kde.org> | 2006-06-24 14:36:02 +0000 |
|---|---|---|
| committer | Allen Winter <winter@kde.org> | 2006-06-24 14:36:02 +0000 |
| commit | 67ba51a1d6557ed9f66cba9012400b7136e89ce4 (patch) | |
| tree | 3b69bdb048b389bcd8ae7f55cadcc6160090a3e7 | |
| parent | 318148f110971cdb1fa9bd303c58804e52b6f9db (diff) | |
| download | extra-cmake-modules-67ba51a1d6557ed9f66cba9012400b7136e89ce4.tar.gz extra-cmake-modules-67ba51a1d6557ed9f66cba9012400b7136e89ce4.tar.bz2 | |
port to new MacroLogFeature()
svn path=/trunk/KDE/kdelibs/; revision=554599
| -rw-r--r-- | modules/FindQtDBus.cmake | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/modules/FindQtDBus.cmake b/modules/FindQtDBus.cmake index 72c2502d..77114bef 100644 --- a/modules/FindQtDBus.cmake +++ b/modules/FindQtDBus.cmake @@ -19,6 +19,7 @@ # QDBUS_ADD_ADAPTORS(SRC_VAR file1.xml ... fileN.xml) # Generates adaptor code from the given XML files. # +INCLUDE(MacroLogFeature) if (QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) @@ -51,20 +52,17 @@ else (QDBUS_INCLUDE_DIRS AND QDBUS_LIBRARIES) PKGCONFIG("dbus-1" _dbusIncDir _dbusLinkDir _dbusLinkFlags _dbusCflags) if (NOT _dbusIncDir) - message(STATUS "You need D-BUS 0.62 or newer.") - message(STATUS "If you have dbus installed, check PKG_CONFIG_PATH so that 'pkg-config --libs dbus-1' works") - message(STATUS "See also the PORTING-TO-DBUS.txt file in kdelibs/") - message(FATAL_ERROR "Could NOT find DBus") + MACRO_LOG_FEATURE(0 "D-BUS" "D-BUS message bus system" "http://www.freedesktop.org/wiki/Software_2fdbus" 1 "0.62" "If you have dbus installed, check PKG_CONFIG_PATH so that 'pkg-config --libs dbus-1' works. See also the PORTING-TO-DBUS.txt file in kdelibs/") endif (NOT _dbusIncDir) PKGCONFIG("dbus-qt4-1" _qdbusIncDir _qdbusLinkDir _qdbusLinkFlags _qdbusCflags) if (NOT _qdbusIncDir) - message(STATUS "You need the Qt4 bindings for dbus. The current recommendation is to install them from kdesupport.") - message(STATUS "If you have qt-dbus installed, check PKG_CONFIG_PATH so that 'pkg-config --libs dbus-qt4-1' works") - message(STATUS "See also the PORTING-TO-DBUS.txt file in kdelibs/") - message(FATAL_ERROR "Could NOT find qt-dbus") + MACRO_LOG_FEATURE(0 "QtDBus" "Qt4 D-BUS Bindings" "$SVNROOT/trunk/kdesupport" 1 "SVN" "If you have qt-dbus installed, check PKG_CONFIG_PATH so that 'pkg-config --libs dbus-qt4-1' works. See also the PORTING-TO-DBUS.txt file in kdelibs/") endif (NOT _qdbusIncDir) + # report and exit here if qbus or qtdbus not found + MACRO_DISPLAY_FEATURE_LOG() + set(QDBUS_DEFINITIONS ${_dbusCflags} ${_qdbusCflags} CACHE INTERNAL "Definitions for Qt DBUS") set(QDBUS_INCLUDE_DIRS ${_dbusIncDir} ${_qdbusIncDir} CACHE INTERNAL "Include dirs for Qt DBUS") |