[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-09-26 19:57:22
Message-ID: 20100926195722.30C47AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1180035 by aseigo:

moved version checking into the proper place (kdelibs cmake module for dbusmenu-qt); \
proper, and will prevent people from fixing the build on windows breaking it for \
everyone else :/


 M  +1 -11     CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/CMakeLists.txt #1180034:1180035
@@ -23,18 +23,8 @@
 find_package(QImageBlitz REQUIRED)
 find_package(ZLIB REQUIRED)
 
-if(WIN32)
-  find_package(DBusMenuQt 1.7.0 REQUIRED)
-else(WIN32)
-  set(DBUSMENU_MIN_VERSION 0.6.0)
-  pkg_check_modules(DBusMenuQt REQUIRED dbusmenu-qt>=${DBUSMENU_MIN_VERSION})
-  if (NOT DBusMenuQt_FOUND)
-    macro_log_feature(DBusMenuQt_FOUND "dbusmenu-qt (>= ${DBUSMENU_MIN_VERSION})" \
"Menus-over-dbus implementation" "pkg_check_modules" TRUE "" "Required for the system \
                tray Plasmoid to operate correctly.")
-  endif (NOT DBusMenuQt_FOUND)
-endif(WIN32)
+find_package(DBusMenuQt 0.6.0 REQUIRED)
 
-
-
 if(Q_WS_X11)
   if(NOT X11_XTest_FOUND)
     macro_log_feature(X11_XTest_FOUND "libXtst" "X11 Testing Resource extension \
library" "http://xorg.freedesktop.org" FALSE "" "useful for automated testing of X \
clients.")


[prev in list] [next in list] [prev in thread] [next in thread]