[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-buildsystem
Subject:    Re: Please review: cmake check for Cagibi
From:       "Friedrich W. H. Kossebau" <kossebau () kde ! org>
Date:       2010-08-24 19:31:15
Message-ID: 201008242131.17273.kossebau () kde ! org
[Download RAW message or body]

Mardi, le 24 août 2010, à 21:23, vous avez écrit:
> On Tuesday 24 August 2010, Friedrich W. H. Kossebau wrote:
> > Mardi, le 24 août 2010, à 20:40, vous avez écrit:
> > So okay to commit the attached patch, both to trunk and 4.5 branch?
> 
> No, no.
> 
> Index: kdebase/runtime/cmake/modules/CMakeLists.txt
> ===================================================================
> --- kdebase/runtime/cmake/modules/CMakeLists.txt	(Revision 1157717)
> +++ kdebase/runtime/cmake/modules/CMakeLists.txt	(Arbeitskopie)
> @@ -2,6 +2,7 @@
> 
>  # don't glob for the files, we don't want to install e.g.
> FindLibKNotification-1.cmake
>  set(cmakeFiles FindCLucene.cmake
> +               FindCagibiDaemon.cmake
>                 FindSLP.cmake)
> 
>  set(module_install_dir ${DATA_INSTALL_DIR}/cmake/modules )
> 
> 
> Do you *really* want to install that file ?
> I think that shouldn't be necessary.

Alright. What about this attached version? :)

Friedrich
-- 
KDE Okteta - a simple hex editor - http://utils.kde.org/projects/okteta

["addCheckForCagibiDaemon.patch" (text/x-patch)]

Index: kdebase/runtime/cmake/modules/FindCagibiDaemon.cmake
===================================================================
--- kdebase/runtime/cmake/modules/FindCagibiDaemon.cmake	(Revision 0)
+++ kdebase/runtime/cmake/modules/FindCagibiDaemon.cmake	(Revision 0)
@@ -0,0 +1,15 @@
+#
+# This module looks for the Cagibi daemon,
+# a SSDP (Simple Service Discovery Protocol, used by UPnP) cache/proxy daemon
+# http://websvn.kde.org/trunk/kdesupport/cagibi/
+
+# It will define the following values
+#
+# CAGIBI_DAEMON_EXECUTABLE  = the executable of the cagibi daemon
+# CAGIBI_DAEMON_FOUND       = set to 1 if cagibi daemon is found
+#
+
+find_program(CAGIBI_DAEMON_EXECUTABLE NAMES cagibid)
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Cagibi_DAEMON  DEFAULT_MSG  CAGIBI_DAEMON_EXECUTABLE)
+mark_as_advanced(CAGIBI_DAEMON_FOUND CAGIBI_DAEMON_EXECUTABLE)
Index: kdebase/runtime/CMakeLists.txt
===================================================================
--- kdebase/runtime/CMakeLists.txt	(Revision 1167176)
+++ kdebase/runtime/CMakeLists.txt	(Arbeitskopie)
@@ -37,6 +37,11 @@
   "OpenSLP" "SLP (Service Location Protocol) implementation" "http://www.openslp.org/" FALSE
   "" "Provides SLP support in the network:/ kioslave."
 )
+macro_optional_find_package(CagibiDaemon)
+macro_log_feature( CAGIBI_DAEMON_FOUND
+  "Cagibi daemon" "SSDP (Simple Service Discovery Protocol, used by UPnP) cache/proxy daemon (RUNTIME \
DEPENDENCY)" "http://websvn.kde.org/trunk/kdesupport/cagibi/" FALSE +  "0.1.1" "Provides UPnP \
device/service listing in the network:/ kio-slave." +)
 
 set(LIBATTICA_MIN_VERSION "0.1.4")
 find_package(LibAttica)



_______________________________________________
Kde-buildsystem mailing list
Kde-buildsystem@kde.org
https://mail.kde.org/mailman/listinfo/kde-buildsystem


[prev in list] [next in list] [prev in thread] [next in thread]