summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2012-10-26 13:58:32 +0200
committerSlávek Banko <slavek.banko@axis.cz>2012-10-26 13:58:32 +0200
commit354555a2b85a35e123ba53dcc893119ef9534a43 (patch)
tree0e52c628440dc98eb876ad6c1e83e41ec4f770ec
parent93dc872306fb4daa2eda10382fff841fd6b9bcdc (diff)
downloadtdenetwork-354555a2b85a35e123ba53dcc893119ef9534a43.tar.gz
tdenetwork-354555a2b85a35e123ba53dcc893119ef9534a43.zip
Added OpenSLP support to CMake
-rw-r--r--CMakeLists.txt1
-rw-r--r--ConfigureChecks.cmake9
-rw-r--r--config.h.cmake3
-rw-r--r--krdc/CMakeLists.txt2
-rw-r--r--krfb/srvloc/CMakeLists.txt2
5 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 606361fa..5d68fa52 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,7 @@ option( WITH_SPEEX "Enable speex support (for jingle)" OFF )
option( WITH_WEBCAM "Enable webcam support (kopete/msn)" OFF )
option( WITH_GSM "Enable GSM SMS support (kopete/sms)" OFF )
option( WITH_ARTS "Enable aRts support" OFF )
+option( WITH_SLP "Enable OpenSLP support (krdc, krfb)" OFF )
##### kopete protocols ##########################
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 9ecdb141..ce92731a 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -30,3 +30,12 @@ endif( )
# required stuff
find_package( TQt )
find_package( TDE )
+
+if( WITH_SLP )
+ check_library_exists( slp "SLPOpen" "" HAVE_SLP )
+ if( HAVE_SLP )
+ set(LIB_SLP slp )
+ else( )
+ tde_message_fatal( "openslp is required, but was not found on your system" )
+ endif( )
+endif( )
diff --git a/config.h.cmake b/config.h.cmake
index 982dd208..d7f383d4 100644
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -21,6 +21,9 @@
#cmakedefine HAVE_SYS_PARAM_H 1
#cmakedefine HAVE_NET_IF_PPP_H 1
+// krcd / krfb
+#cmakedefine HAVE_SLP 1
+
// ktalkd
#cmakedefine HAVE_SYS_TYPES_H 1
#cmakedefine HAVE_SYS_STAT_H 1
diff --git a/krdc/CMakeLists.txt b/krdc/CMakeLists.txt
index 22869a0b..53dc852b 100644
--- a/krdc/CMakeLists.txt
+++ b/krdc/CMakeLists.txt
@@ -60,6 +60,6 @@ tde_add_executable( krdc AUTOMOC
maindialogbase.ui keycapturewidget.ui kservicelocator.cpp
keycapturedialog.cpp kremoteview.cpp smartptr.cpp hostpreferences.cpp
preferencesdialog.cpp maindialogwidget.cpp maindialog.cpp
- LINK vnc-static rdp-static tdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext
+ LINK vnc-static rdp-static tdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext ${LIB_SLP}
DESTINATION ${BIN_INSTALL_DIR}
)
diff --git a/krfb/srvloc/CMakeLists.txt b/krfb/srvloc/CMakeLists.txt
index 095bcf54..a6b77211 100644
--- a/krfb/srvloc/CMakeLists.txt
+++ b/krfb/srvloc/CMakeLists.txt
@@ -24,4 +24,6 @@ tde_add_library( srvloc STATIC_PIC AUTOMOC
SOURCES
kserviceregistry.cpp uuid.cpp kinetinterface.cpp
kinetinterfacewatcher.cpp getifaddrs.cpp
+ LINK
+ ${LIB_SLP}
)