diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2012-10-26 13:58:32 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-10-26 14:03:51 +0200 |
| commit | 702c18042272aad4f63effb0dbc5be69a055faa3 (patch) | |
| tree | 749e2fa5b4e43980bea34fa1728e9a5072e03308 | |
| parent | a2b383477a4fcbfdf8d1372ac9009692d48dfc76 (diff) | |
| download | tdenetwork-702c18042272aad4f63effb0dbc5be69a055faa3.tar.gz tdenetwork-702c18042272aad4f63effb0dbc5be69a055faa3.zip | |
Added OpenSLP support to CMake
(cherry picked from commit 354555a2b85a35e123ba53dcc893119ef9534a43)
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | ConfigureChecks.cmake | 9 | ||||
| -rw-r--r-- | config.h.cmake | 3 | ||||
| -rw-r--r-- | krdc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | krfb/srvloc/CMakeLists.txt | 2 |
5 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d7123909..26017435 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 896491f0..fc046210 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -16,3 +16,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 5451be71..47b30564 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 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} ) 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} ) |