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

List:       kde-commits
Subject:    [kdelibs/frameworks] tier1/solid/src/solid: Don't build UDisk backends if UDev libs weren't found
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2013-11-01 12:24:24
Message-ID: E1VcDm4-0002OX-AB () scm ! kde ! org
[Download RAW message or body]

Git commit 724e5b8b072fbe935ccc2eecc8126669ee5b4da0 by Martin Klapetek.
Committed on 01/11/2013 at 12:07.
Pushed by mklapetek into branch 'frameworks'.

Don't build UDisk backends if UDev libs weren't found

UDisk backends depend on UDevQt library, which is built only if UDev is
found, so both backends shouldn't be built if there's no UDev (because
then there's no UDevQt).

Reviewed-by: Alex Fiestas

M  +2    -2    tier1/solid/src/solid/CMakeLists.txt
M  +2    -2    tier1/solid/src/solid/managerbase.cpp

http://commits.kde.org/kdelibs/724e5b8b072fbe935ccc2eecc8126669ee5b4da0

diff --git a/tier1/solid/src/solid/CMakeLists.txt b/tier1/solid/src/solid/C=
MakeLists.txt
index 3f48dfb..4024099 100644
--- a/tier1/solid/src/solid/CMakeLists.txt
+++ b/tier1/solid/src/solid/CMakeLists.txt
@@ -262,7 +262,7 @@ if(NOT WIN32 AND NOT APPLE)
    )
 =

    # FIXME: this should work on more Unix systems
-   if (CMAKE_SYSTEM_NAME MATCHES Linux)
+   if (CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND)
        if ( WITH_SOLID_UDISKS2 )
            message(STATUS "Building Solid UDisks2 backend." )
            add_definitions(-DWITH_SOLID_UDISKS2)
@@ -295,7 +295,7 @@ if(NOT WIN32 AND NOT APPLE)
            backends/udisks/udisksgenericinterface.cpp
           )
        endif ( WITH_SOLID_UDISKS2 )
-   endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+   endif (CMAKE_SYSTEM_NAME MATCHES Linux AND UDEV_FOUND)
 =

    message(STATUS "Building Solid fstab backend." )
    set(solid_LIB_SRCS ${solid_LIB_SRCS}
diff --git a/tier1/solid/src/solid/managerbase.cpp b/tier1/solid/src/solid/=
managerbase.cpp
index 5df63ce..282dab5 100644
--- a/tier1/solid/src/solid/managerbase.cpp
+++ b/tier1/solid/src/solid/managerbase.cpp
@@ -90,13 +90,13 @@ void Solid::ManagerBasePrivate::loadBackends()
             } else {
 #               if UDEV_FOUND
                     m_backends << new Solid::Backends::UDev::UDevManager(0=
);
-#               endif
 #		if defined(WITH_SOLID_UDISKS2)
                 m_backends << new Solid::Backends::UDisks2::Manager(0)
 #		else
                 m_backends << new Solid::Backends::UDisks::UDisksManager(0)
 #		endif
-                           << new Solid::Backends::UPower::UPowerManager(0)
+#               endif
+                m_backends << new Solid::Backends::UPower::UPowerManager(0)
                            << new Solid::Backends::Fstab::FstabManager(0);
             }
 #        endif

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