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

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Patrick von Reth <patrick.vonreth () gmail ! com>
Date:       2010-09-25 10:33:10
Message-ID: 20100925103310.62C57AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1179410 by vonreth:

reverted last commit for windows, we don īt supoort pkgconfig

 M  +7 -1      CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/CMakeLists.txt #1179409:1179410
@@ -22,13 +22,19 @@
 find_package(Strigi REQUIRED)
 find_package(QImageBlitz REQUIRED)
 find_package(ZLIB REQUIRED)
-#find_package(DBusMenuQt 1.7.0 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)
 
+
+
 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]