From kde-buildsystem  Tue Aug 24 19:14:32 2010
From: "Friedrich W. H. Kossebau" <kossebau () kde ! org>
Date: Tue, 24 Aug 2010 19:14:32 +0000
To: kde-buildsystem
Subject: Re: Please review: cmake check for Cagibi
Message-Id: <201008242114.34004.kossebau () kde ! org>
X-MARC-Message: https://marc.info/?l=kde-buildsystem&m=128267733819914
MIME-Version: 1
Content-Type: multipart/mixed; boundary="--Boundary-00=_ZoBdMGZYOMHL2bF"

--Boundary-00=_ZoBdMGZYOMHL2bF
Content-Type: Text/Plain;
  charset="iso-8859-15"
Content-Transfer-Encoding: quoted-printable

Mardi, le 24 ao=FBt 2010, =E0 20:40, vous avez =E9crit:
> On Monday 23 August 2010, Friedrich W. H. Kossebau wrote:
> The following 4 lines should be good enough:
>=20
> find_program(CAGIBI_DAEMON NAMES cagibid)
> include(FindPackageHandleStandardArgs)
> find_package_handle_standard_args(Cagibi  DEFAULT_MSG  CAGIBI_DAEMON)
> mark_as_advanced(CAGIBI_FOUND CAGIBI_DAEMON)
>=20
>=20
> Support for checking the version will come soon to FPHSA(), don't start
> with FOO_MIN_VERSION now.
>=20
> Maybe you could also rename the file to FindCagibiDaemon.cmake to make ve=
ry
> clear what it does, as name for the variable I would suggest
> CAGIBI_DAEMON_EXECUTABLE.

So okay to commit the attached patch, both to trunk and 4.5 branch?

Cheers
=46riedrich
=2D-=20
KDE Okteta - a simple hex editor - http://utils.kde.org/projects/okteta

--Boundary-00=_ZoBdMGZYOMHL2bF
Content-Type: text/x-patch;
  charset="UTF-8";
  name="addCheckForCagibiDaemon.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename="addCheckForCagibiDaemon.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/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 )
Index: kdebase/runtime/CMakeLists.txt
===================================================================
--- kdebase/runtime/CMakeLists.txt	(Revision 1167176)
+++ kdebase/runtime/CMakeLists.txt	(Arbeitskopie)
@@ -37,6 +37,12 @@
   "OpenSLP" "SLP (Service Location Protocol) implementation" "http://www.openslp.org/" FALSE
   "" "Provides SLP support in the network:/ kioslave."
 )
+set(CAGIBI_MIN_VERSION "0.1.1")
+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
+  ${CAGIBI_MIN_VERSION} "Provides UPnP device/service listing in the network:/ kio-slave."
+)
 
 set(LIBATTICA_MIN_VERSION "0.1.4")
 find_package(LibAttica)

--Boundary-00=_ZoBdMGZYOMHL2bF
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

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

--Boundary-00=_ZoBdMGZYOMHL2bF--