summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-27 13:02:37 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2015-06-27 13:02:37 (GMT)
commit421c249f1ff8e75ce646b6d94c0e0a141b30f2a8 (patch)
tree2ae6be28ab11cfcb6087001e62842b7da5a6c984
parent5e3fd5744622dd3d7030427611f7ae588dc72dc6 (diff)
downloadtdeutils-421c249f.zip
tdeutils-421c249f.tar.gz
Fix build on freebsd
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--ConfigureChecks.cmake18
-rw-r--r--ksim/monitors/disk/CMakeLists.txt2
-rw-r--r--superkaramba/src/CMakeLists.txt1
-rw-r--r--superkaramba/src/imagelabel.h4
-rw-r--r--tdelirc/irkick/tdelircclient.cpp4
5 files changed, 27 insertions, 2 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 765f608..509362a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -164,6 +164,17 @@ if ( BUILD_KSIM )
tde_message_fatal( "netsnmp is required, but was not found on your system" )
endif ()
endif( WITH_SNMP )
+
+ check_library_exists( devstat selectdevs "" HAVE_DEVSTAT_SELECTDEVS )
+ if( HAVE_DEVSTAT_SELECTDEVS )
+ set( DEVSTAT_LIBRARIES devstat )
+ else( )
+ check_library_exists( devstat devstat_selectdevs "" HAVE_DEVSTAT_DEVSTAT_SELECTDEVS )
+ if( HAVE_DEVSTAT_DEVSTAT_SELECTDEVS )
+ set( DEVSTAT_LIBRARIES devstat )
+ endif( )
+ endif( HAVE_DEVSTAT_SELECTDEVS )
+
endif ( BUILD_KSIM )
@@ -185,6 +196,13 @@ if ( BUILD_SUPERKARAMBA )
if( WITH_XMMS )
set( HAVE_XMMS 1 )
endif( WITH_XMMS )
+
+ if( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
+ check_library_exists( kvm kvm_getswapinfo "" HAVE_LIBKVM )
+ if( HAVE_LIBKVM )
+ set( LIBKVM_LIBRARIES kvm )
+ endif( )
+ endif( )
endif ( BUILD_SUPERKARAMBA )
diff --git a/ksim/monitors/disk/CMakeLists.txt b/ksim/monitors/disk/CMakeLists.txt
index 0dfb879..b37ca18 100644
--- a/ksim/monitors/disk/CMakeLists.txt
+++ b/ksim/monitors/disk/CMakeLists.txt
@@ -28,7 +28,7 @@ link_directories(
tde_add_kpart( ksim_disk AUTOMOC
SOURCES ksimdisk.cpp
- LINK ksimcore-shared
+ LINK ksimcore-shared ${DEVSTAT_LIBRARIES}
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/superkaramba/src/CMakeLists.txt b/superkaramba/src/CMakeLists.txt
index b0f9a4e..8f560b6 100644
--- a/superkaramba/src/CMakeLists.txt
+++ b/superkaramba/src/CMakeLists.txt
@@ -56,6 +56,7 @@ tde_add_executable( superkaramba AUTOMOC
svcgrp_python.cpp
LINK tdeio-shared ${PYTHON_LIBRARIES}
${TDENEWSTUFF_LIBRARIES}
+ ${LIBKVM_LIBRARIES}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/superkaramba/src/imagelabel.h b/superkaramba/src/imagelabel.h
index 9ed9672..1346c2e 100644
--- a/superkaramba/src/imagelabel.h
+++ b/superkaramba/src/imagelabel.h
@@ -38,7 +38,9 @@
#include "karamba.h"
class ImageLabel;
-class TDEIO::CopyJob;
+namespace TDEIO {
+ class CopyJob;
+}
// Abstract Effects Baseclass
class Effect : public TQObject
diff --git a/tdelirc/irkick/tdelircclient.cpp b/tdelirc/irkick/tdelircclient.cpp
index feb69cb..ee00c88 100644
--- a/tdelirc/irkick/tdelircclient.cpp
+++ b/tdelirc/irkick/tdelircclient.cpp
@@ -55,7 +55,11 @@ bool KLircClient::connectToLirc()
sockaddr_un addr;
addr.sun_family = AF_UNIX;
+#if defined(__FreeBSD__)
+ strcpy(addr.sun_path, "/var/run/lirc/lircd");
+#else
strcpy(addr.sun_path, "/dev/lircd");
+#endif
if(::connect(sock, (struct sockaddr *)(&addr), sizeof(addr)) == -1)
{ ::close(sock);
// in case of mandrake...