Mardi, le 24 août 2010, à 20:40, vous avez écrit: > On Monday 23 August 2010, Friedrich W. H. Kossebau wrote: > The following 4 lines should be good enough: > > 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) > > > Support for checking the version will come soon to FPHSA(), don't start > with FOO_MIN_VERSION now. > > Maybe you could also rename the file to FindCagibiDaemon.cmake to make very > 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 Friedrich -- KDE Okteta - a simple hex editor - http://utils.kde.org/projects/okteta
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)
_______________________________________________ Kde-buildsystem mailing list Kde-buildsystem@kde.org https://mail.kde.org/mailman/listinfo/kde-buildsystem
