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

List:       kde-commits
Subject:    KDE/kdelibs/solid/solid
From:       Rafael Fernández López <ereslibre () kde ! org>
Date:       2010-10-03 12:53:19
Message-ID: 20101003125319.678C4AC891 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1182134 by ereslibre:

Add a very basic UDev backend that lists devices. This backend is going to support \
those kind of devices that are not supported by UDisks and UPower backends.


 M  +17 -1     CMakeLists.txt  
 A             backends/udev (directory)  
 A             backends/udev/udev.h   [License: LGPL]
 A             backends/udev/udevdevice.cpp   [License: LGPL]
 A             backends/udev/udevdevice.h   [License: LGPL]
 A             backends/udev/udevmanager.cpp   [License: LGPL]
 A             backends/udev/udevmanager.h   [License: LGPL]
 M  +1 -0      config-solid.h.cmake  
 M  +7 -0      managerbase.cpp  


--- trunk/KDE/kdelibs/solid/solid/CMakeLists.txt #1182133:1182134
@@ -40,6 +40,7 @@
 file(MAKE_DIRECTORY
    ${CMAKE_CURRENT_BINARY_DIR}/backends/fakehw
    ${CMAKE_CURRENT_BINARY_DIR}/backends/hal
+   ${CMAKE_CURRENT_BINARY_DIR}/backends/udev
    ${CMAKE_CURRENT_BINARY_DIR}/backends/wmi
 )
 
@@ -145,8 +146,10 @@
 
 #   )
 
+   macro_optional_find_package( UDev )
    macro_optional_find_package( HUpnp )
    macro_log_feature( HUPNP_FOUND "HUPnP" "Qt-based library for building UPnP \
devices and control points" "http://www.herqq.org" FALSE "" "" ) +   \
macro_log_feature( UDEV_FOUND "UDev" "UDev dynamic /dev directory " \
"http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" FALSE "" "" )  \
configure_file( config-solid.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-solid.h )  if \
( HUPNP_FOUND )  include_directories( ${HUPNP_INCLUDE_DIR} )
@@ -161,8 +164,16 @@
          backends/upnp/upnpcontrolpoint.cpp
       )
 
-   endif()
+   endif( HUPNP_FOUND )
 
+   if ( UDEV_FOUND )
+      set(solid_LIB_SRCS ${solid_LIB_SRCS}
+      backends/udev/udevdevice.cpp
+      backends/udev/udevmanager.cpp
+      )
+   endif( UDEV_FOUND )
+
+
    message(STATUS "Building Solid HAL backend." )
    set(solid_LIB_SRCS ${solid_LIB_SRCS}
 
@@ -217,6 +228,7 @@
    backends/fstab/fstabhandling.cpp
    backends/fstab/fstabwatcher.cpp
    )
+
 endif(NOT WIN32 AND NOT APPLE)
 
 if(APPLE)
@@ -306,6 +318,10 @@
    set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${HUPNP_LIBS})
 endif( HUPNP_FOUND )
 
+if ( UDEV_FOUND )
+   set(solid_OPTIONAL_LIBS ${solid_OPTIONAL_LIBS} ${UDEV_LIBS})
+endif ( UDEV_FOUND )
+
 target_link_libraries(solid ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} \
${QT_QTXML_LIBRARY} ${QT_QTGUI_LIBRARY} ${solid_OPTIONAL_LIBS} )  \
target_link_libraries(solid LINK_INTERFACE_LIBRARIES ${QT_CORE_LIBRARY} )  
--- trunk/KDE/kdelibs/solid/solid/config-solid.h.cmake #1182133:1182134
@@ -18,4 +18,5 @@
     License along with this library. If not, see <http://www.gnu.org/licenses/>.
 */
 
+#cmakedefine UDEV_FOUND
 #cmakedefine HUPNP_FOUND
--- trunk/KDE/kdelibs/solid/solid/managerbase.cpp #1182133:1182134
@@ -38,6 +38,10 @@
 #include "backends/upnp/upnpdevicemanager.h"
 #endif
 
+#if defined (UDEV_FOUND)
+#include "backends/udev/udevmanager.h"
+#endif
+
 #include "backends/fstab/fstabmanager.h"
 
 #elif defined (Q_WS_WIN) && defined(HAVE_WBEM) && !defined(_WIN32_WCE)
@@ -64,6 +68,9 @@
 #        if defined (Q_OS_MAC)
             m_backends << new Solid::Backends::IOKit::IOKitManager(0);
 #        elif defined (Q_OS_UNIX)
+#           if defined (UDEV_FOUND)
+                m_backends << new Solid::Backends::UDev::UDevManager(0);
+#           endif
             m_backends << new Solid::Backends::Hal::HalManager(0)
                        << new Solid::Backends::UDisks::UDisksManager(0)
                        << new Solid::Backends::UPower::UPowerManager(0)


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