[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs/solid/solid
From: Raphael Kubo da Costa <kubito () gmail ! com>
Date: 2010-11-15 23:44:02
Message-ID: 20101115234402.3B45EAC8A0 () svn ! kde ! org
[Download RAW message or body]
SVN commit 1197469 by rkcosta:
Only build the udisks backend on Linux.
Recent commits added a hard dependency on linux_dvd_rw_utils.{c,h}
that cannot be #ifdef'ed with Q_OS_LINUX. Until that is fixed, we need
to skip the udisks backend for kdelibs to build again on OpenSolaris,
FreeBSD and other non-Linux Unixes.
CCMAIL: lukas@kde.org
CCMAIL: kde-hardware-devel@kde.org
M +23 -7 CMakeLists.txt
--- trunk/KDE/kdelibs/solid/solid/CMakeLists.txt #1197468:1197469
@@ -208,6 +208,28 @@
backends/hal/halvolume.cpp
backends/hal/halsmartcardreader.cpp
+ # backends/udisks/udisksmanager.cpp
+ # backends/udisks/udisksdevice.cpp
+ # backends/udisks/udisksblock.cpp
+ # backends/udisks/udisksstoragevolume.cpp
+ # backends/udisks/udisksdeviceinterface.cpp
+ # backends/udisks/udisksopticaldisc.cpp
+ # backends/udisks/udisksopticaldrive.cpp
+ # backends/udisks/udisksstoragedrive.cpp
+ # backends/udisks/udisksstorageaccess.cpp
+ # backends/udisks/udisksgenericinterface.cpp
+
+ backends/upower/upowermanager.cpp
+ backends/upower/upowerdevice.cpp
+ backends/upower/upowerbattery.cpp
+ backends/upower/upoweracadapter.cpp
+ backends/upower/upowerdeviceinterface.cpp
+ backends/upower/upowergenericinterface.cpp
+ )
+
+ # FIXME: this should work on more Unix systems
+ if (CMAKE_SYSTEM_NAME MATCHES Linux)
+ set(solid_LIB_SRCS ${solid_LIB_SRCS}
backends/udisks/udisksmanager.cpp
backends/udisks/udisksdevice.cpp
backends/udisks/udisksblock.cpp
@@ -218,14 +240,8 @@
backends/udisks/udisksstoragedrive.cpp
backends/udisks/udisksstorageaccess.cpp
backends/udisks/udisksgenericinterface.cpp
-
- backends/upower/upowermanager.cpp
- backends/upower/upowerdevice.cpp
- backends/upower/upowerbattery.cpp
- backends/upower/upoweracadapter.cpp
- backends/upower/upowerdeviceinterface.cpp
- backends/upower/upowergenericinterface.cpp
)
+ endif (CMAKE_SYSTEM_NAME MATCHES Linux)
message(STATUS "Building Solid fstab backend." )
set(solid_LIB_SRCS ${solid_LIB_SRCS}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic