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

List:       kde-commits
Subject:    [solid] src/solid/devices: Add a CMake option to switch between HAL and UDisks managers on FreeBSD.
From:       Gleb Popov <6yearold () gmail ! com>
Date:       2016-10-31 19:38:12
Message-ID: E1c1IPM-0008WG-Qs () code ! kde ! org
[Download RAW message or body]

Git commit 96be26ee6902c9d2aa8123a540f00ce0e2751871 by Gleb Popov.
Committed on 31/10/2016 at 18:57.
Pushed by arrowdodger into branch 'master'.

Add a CMake option to switch between HAL and UDisks managers on FreeBSD.

REVIEW: 129293

M  +4    -0    src/solid/devices/CMakeLists.txt
M  +2    -0    src/solid/devices/config-solid.h.cmake
M  +4    -0    src/solid/devices/managerbase.cpp

http://commits.kde.org/solid/96be26ee6902c9d2aa8123a540f00ce0e2751871

diff --git a/src/solid/devices/CMakeLists.txt b/src/solid/devices/CMakeList=
s.txt
index d51ebb3..b841b54 100644
--- a/src/solid/devices/CMakeLists.txt
+++ b/src/solid/devices/CMakeLists.txt
@@ -94,6 +94,10 @@ list(APPEND solid_LIB_SRCS ${BISON_SolidParser_OUTPUTS} =
${FLEX_SolidLexer_OUTPUT
 include(devices/backends/fakehw/CMakeLists.txt)
 =

 if(NOT WIN32 AND NOT APPLE)
+   if (CMAKE_SYSTEM_NAME MATCHES FreeBSD)
+      option(EXPERIMENTAL_BSDISKS "Use UDisks2/bsdisks backend instead of =
HAL to manage disk devices" OFF)
+   endif()
+
    if ( UDEV_FOUND )
       message(STATUS "Building Solid UDev backend." )
       include(devices/backends/udev/CMakeLists.txt)
diff --git a/src/solid/devices/config-solid.h.cmake b/src/solid/devices/con=
fig-solid.h.cmake
index a68af32..b2d7d4c 100644
--- a/src/solid/devices/config-solid.h.cmake
+++ b/src/solid/devices/config-solid.h.cmake
@@ -33,3 +33,5 @@
 #cmakedefine01 GETMNTINFO_USES_STATVFS
 =

 #cmakedefine01 UDEV_HAVE_GET_SYSATTR_LIST_ENTRY
+
+#cmakedefine01 EXPERIMENTAL_BSDISKS
diff --git a/src/solid/devices/managerbase.cpp b/src/solid/devices/managerb=
ase.cpp
index eee4de5..08b915e 100644
--- a/src/solid/devices/managerbase.cpp
+++ b/src/solid/devices/managerbase.cpp
@@ -65,7 +65,11 @@ void Solid::ManagerBasePrivate::loadBackends()
 =

 #        elif defined(Q_OS_FREEBSD)
         m_backends << new Solid::Backends::UPower::UPowerManager(0)
+#               if EXPERIMENTAL_BSDISKS
+                   << new Solid::Backends::UDisks2::Manager(0)
+#               else
                    << new Solid::Backends::Hal::HalManager(0)
+#               endif
                    << new Solid::Backends::Fstab::FstabManager(0);
 =

 #        elif defined(Q_OS_WIN) && !defined(_WIN32_WCE)
[prev in list] [next in list] [prev in thread] [next in thread]