Attachment 936 Details for Bug 1278 – Added OpenSLP support to CMake

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] Added OpenSLP support to CMake

bp907.diff (text/plain), 2.46 KB, created by Slávek Banko on 2012-10-25 14:42:48 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Slávek Banko

Created: 2012-10-25 14:42:48 CDT

Size: 2.46 KB

patch

obsolete

>Index: b/CMakeLists.txt
>===================================================================
>--- a/CMakeLists.txt	2012-10-25 21:07:29.000000000 +0200
>+++ b/CMakeLists.txt	2012-10-25 21:08:28.000000000 +0200
>@@ -49,6 +49,7 @@
> 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 ##########################
>Index: b/ConfigureChecks.cmake
>===================================================================
>--- a/ConfigureChecks.cmake	2012-10-25 21:07:29.000000000 +0200
>+++ b/ConfigureChecks.cmake	2012-10-25 21:08:28.000000000 +0200
>@@ -16,3 +16,12 @@
> # 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( )
>Index: b/krdc/CMakeLists.txt
>===================================================================
>--- a/krdc/CMakeLists.txt	2012-10-25 21:07:29.000000000 +0200
>+++ b/krdc/CMakeLists.txt	2012-10-25 21:08:28.000000000 +0200
>@@ -60,6 +60,6 @@
>     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 kdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext
>+  LINK vnc-static rdp-static kdeui-shared kdnssd-shared kwalletclient-shared jpeg Xext ${LIB_SLP}
>   DESTINATION ${BIN_INSTALL_DIR}
> )
>Index: b/krfb/srvloc/CMakeLists.txt
>===================================================================
>--- a/krfb/srvloc/CMakeLists.txt	2012-10-25 21:07:29.000000000 +0200
>+++ b/krfb/srvloc/CMakeLists.txt	2012-10-25 21:08:28.000000000 +0200
>@@ -24,4 +24,6 @@
>   SOURCES
>     kserviceregistry.cpp uuid.cpp kinetinterface.cpp
>     kinetinterfacewatcher.cpp getifaddrs.cpp
>+  LINK
>+    ${LIB_SLP}
> )
>Index: b/config.h.cmake
>===================================================================
>--- a/config.h.cmake	2012-10-25 21:19:09.000000000 +0200
>+++ b/config.h.cmake	2012-10-25 21:19:38.000000000 +0200
>@@ -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

Actions: View | Diff

Attachments on bug 1278: 936 | 937