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

List:       kde-commits
Subject:    KDE/kdebase/workspace
From:       Pino Toscano <pino () kde ! org>
Date:       2010-06-06 13:40:28
Message-ID: 20100606134028.8B136AC8CC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1135118 by pino:

kinfocenter does not require qt3support, just its samba module does, so properly \
change the dependency


 M  +3 -3      CMakeLists.txt  
 M  +2 -0      kinfocenter/Modules/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/CMakeLists.txt #1135117:1135118
@@ -136,9 +136,9 @@
   endif(POLKITQT_FOUND)
 endif(NOT WIN32)
 
-if (Q_WS_X11 AND ${QT_QT3SUPPORT_FOUND})
-  add_subdirectory(kinfocenter)
-endif (Q_WS_X11 AND ${QT_QT3SUPPORT_FOUND})
+if (Q_WS_X11)
+  macro_optional_add_subdirectory( kinfocenter )
+endif (Q_WS_X11)
 
 macro_optional_add_subdirectory( klipper )
 macro_optional_add_subdirectory( krunner )
--- trunk/KDE/kdebase/workspace/kinfocenter/Modules/CMakeLists.txt #1135117:1135118
@@ -7,7 +7,9 @@
 add_subdirectory( nics )
 
 if(NOT WIN32)
+  if(QT_QT3SUPPORT_FOUND)
   add_subdirectory( samba )
+  endif(QT_QT3SUPPORT_FOUND)
 
   macro_optional_find_package(OpenGL)
   macro_log_feature(OPENGL_FOUND "OpenGL" "API for developing portable, interactive \
2D and 3D graphics applications" "http://mesa3d.sourceforge.net" FALSE "" "View \
OpenGL details in kinfocenter.")


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