From ba176d1eb6c0e53fc686f0526c1994bbfc65fab8 Mon Sep 17 00:00:00 2001 From: Manuel Nickschas Date: Thu, 1 Apr 2010 13:35:18 +0200 Subject: [PATCH] Don't link to libindicate-qt when we disable Ayatana support Looks like the CMake variables are set by some other package... --- CMakeLists.txt | 7 +++++-- src/CMakeLists.txt | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a3878ce..2a449b70 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -249,6 +249,7 @@ if(WITH_LIBINDICATE) pkg_check_modules(INDICATEQT indicate-qt>=0.2.1) if(INDICATEQT_FOUND) message(STATUS "Enabling Ayatana notification support") + set(HAVE_INDICATEQT true) add_definitions(-DHAVE_INDICATEQT) else(INDICATEQT_FOUND) message(STATUS "Disabling Ayatana notification support") @@ -256,6 +257,8 @@ if(WITH_LIBINDICATE) endif(PKG_CONFIG_FOUND) else(WITH_LIBINDICATE) message(STATUS "Not enabling Ayatana notification support") + # We don't want to link against it even if another package has found it + set(INDICATEQT_LIBRARIES "") endif(WITH_LIBINDICATE) # Now set up install locations; those are set by KDE if integration is enabled @@ -309,9 +312,9 @@ if(WIN32) endif(HAVE_SSL AND STATIC) endif(WIN32) -if(INDICATEQT_FOUND) +if(HAVE_INDICATEQT) add_definitions(-DXDG_APPS_INSTALL_DIR=${XDG_APPS_INSTALL_DIR}) -endif(INDICATEQT_FOUND) +endif(HAVE_INDICATEQT) # We need to create a version.gen # For this, we create our genversion binary and make sure it is run every time. diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7e67d02f..99de01d9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -34,9 +34,9 @@ qt4_add_resources(CLIENT_DEPS ${CLIENT_RCS}) qt4_add_resources(CORE_DEPS ${CORE_RCS}) qt4_add_resources(COMMON_DEPS ${COMMON_RCS}) -if(INDICATEQT_FOUND) +if(HAVE_INDICATEQT) link_directories(${INDICATEQT_LIBRARY_DIRS}) -endif(INDICATEQT_FOUND) +endif(HAVE_INDICATEQT) if(WANT_CORE) setup_qt4_variables(NETWORK SCRIPT SQL) -- 2.20.1