diff --git a/CMakeLists.txt b/CMakeLists.txt index ea3bccb20..e78eba98c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ FIND_PACKAGE( QJSON REQUIRED ) INCLUDE( MacroOptionalFindPackage ) INCLUDE( MacroLogFeature ) macro_optional_find_package(Gloox 1.0) -macro_log_feature(Gloox_FOUND "Gloox" "A portable high-level Jabber/XMPP library for C++" "http://camaya.net/gloox" FALSE "" "Gloox is needed for the Jabber SIP plugin and the XMPP-Bot") +macro_log_feature(GLOOX_FOUND "Gloox" "A portable high-level Jabber/XMPP library for C++" "http://camaya.net/gloox" FALSE "" "Gloox is needed for the Jabber SIP plugin and the XMPP-Bot") macro_display_feature_log() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a91b24865..21e3d9225 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -143,9 +143,9 @@ IF( UNIX ) ENDIF( UNIX ) -IF(Gloox_FOUND) +IF(GLOOX_FOUND) ADD_SUBDIRECTORY( xmppbot ) -ENDIF(Gloox_FOUND) +ENDIF(GLOOX_FOUND) ADD_SUBDIRECTORY( sip ) kde4_add_app_icon( tomahawkSources "${CMAKE_SOURCE_DIR}/data/icons/tomahawk-icon-*.png" ) diff --git a/src/sip/CMakeLists.txt b/src/sip/CMakeLists.txt index 235405165..039114f3c 100644 --- a/src/sip/CMakeLists.txt +++ b/src/sip/CMakeLists.txt @@ -1,7 +1,7 @@ -IF(Gloox_FOUND) +IF(GLOOX_FOUND) ADD_SUBDIRECTORY( jabber ) -ENDIF(Gloox_FOUND) +ENDIF(GLOOX_FOUND) ADD_SUBDIRECTORY( twitter ) ADD_SUBDIRECTORY( zeroconf ) diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index c5eed0acc..896d53de5 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -37,7 +37,7 @@ #endif // should go to a plugin actually -#ifdef Gloox_FOUND +#ifdef GLOOX_FOUND #include "xmppbot/xmppbot.h" #endif @@ -479,7 +479,7 @@ TomahawkApp::setupSIP() { qDebug() << Q_FUNC_INFO; -#ifdef Gloox_FOUND +#ifdef GLOOX_FOUND //FIXME: jabber autoconnect is really more, now that there is sip -- should be renamed and/or split out of jabber-specific settings if( !arguments().contains( "--nosip" ) && TomahawkSettings::instance()->jabberAutoConnect() ) {