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

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Adriaan de Groot <groot () kde ! org>
Date:       2010-07-04 8:58:45
Message-ID: 20100704085845.558FDAC8E3 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1145816 by adridg:

Add some more log_feature for X11 libraries; this just makes them show up in the list \
of missing required packages, instead of the user having to determine from the cmake \
error messages what is missing (e.g. CMake Error: The following variables are used in \
this project, but they are set to NOTFOUND. X11_Xkbfile_LIB (ADVANCED) linked by \
target kded_keyboard in directory workspace/kcontrol/keyboard)

 M  +10 -0     CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/CMakeLists.txt #1145815:1145816
@@ -28,6 +28,16 @@
   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.")  endif(NOT X11_XTest_FOUND)
+  # Other X11 libraries that are used unconditionally elsewhere
+  # without testing if they are found. With these log messages
+  # you get a nice complaint about missing required packages
+  # before the CMake error list of unused variables.
+  if(NOT X11_Xkbfile_FOUND)
+    macro_log_feature(X11_Xkbfile_FOUND "libXkbfile" "X11 keyboard layout library" \
"http://xorg.freedesktop.org" TRUE "" "Needed for keyboard modules.") +  endif(NOT \
X11_Xkbfile_FOUND) +  if(NOT X11_Xcomposite_FOUND)
+    macro_log_feature(X11_Xcomposite_FOUND "libXcomposite" "X11 composite library" \
"http://xorg.freedesktop.org" TRUE "" "Needed for plasma tray and notifications.") +  \
endif(NOT X11_Xcomposite_FOUND)  endif(Q_WS_X11)
 
 macro_optional_find_package(GLIB2)


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