SVN commit 885903 by jkerr: protocols/meanwhile: Add CMake check for libmeanwhile Add a cmake/modules/FindLibMeanwhile cmake check for the libmeanwhile package, and enable conditional compilation of the meanwhile protocol. A cmake/modules/FindLibMeanwhile.cmake M +4 -0 kopete/CMakeLists.txt M +8 -1 kopete/protocols/CMakeLists.txt --- trunk/KDE/kdenetwork/kopete/CMakeLists.txt #885902:885903 @@ -33,6 +33,10 @@ macro_bool_to_01(LIBMSN_FOUND HAVE_LIBMSN) macro_log_feature(LIBMSN_FOUND "libmsn" "A library providing support for the msn protocol" "http://sourceforge.net/projects/libmsn" FALSE "0.4.0" "Required for the Kopete wlm plugin") +macro_optional_find_package(LibMeanwhile) +macro_bool_to_01(LIBMEANWHILE_FOUND HAVE_LIBMEANWHILE) +macro_log_feature(LIBMEANWHILE_FOUND "libmeanwhile" "A library for protocol support for connection to Sametime servers" "http://libmeanwhile.sf.net" FALSE "" "Required for the Kopete Meanwhile protocol") + check_include_files(valgrind/valgrind.h HAVE_VALGRIND_H) check_include_files(stdint.h HAVE_STDINT_H) check_include_files(inttypes.h HAVE_INTTYPES_H) --- trunk/KDE/kdenetwork/kopete/protocols/CMakeLists.txt #885902:885903 @@ -20,6 +20,7 @@ option(WITH_bonjour "Enable Kopete Bonjour protocol" ON) option(WITH_irc "Enable Kopete IRC protocol" OFF) option(WITH_wlm "Enable Window Live Messenger support" ON) +option(WITH_meanwhile "Enable Kopete meanwhile protocol" ON) include_directories(${KOPETE_INCLUDES}) @@ -86,4 +87,10 @@ add_subdirectory( bonjour ) endif(WITH_bonjour) -message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Meanwhile protocol has been disabled because it is not ported to KDE4 yet.") +if(WITH_meanwhile) + if(LIBMEANWHILE_FOUND) + add_subdirectory( meanwhile ) + else(LIBMEANWHILE_FOUND) + message(STATUS "${CMAKE_CURRENT_SOURCE_DIR}: Disabled Meanwhile beause libmeanwhile was not found") + endif(LIBMEANWHILE_FOUND) +endif(WITH_meanwhile)