* [gentoo-commits] gentoo-x86 commit in net-misc/csync/files: csync-0.70.1-automagicness.patch
@ 2013-01-22 20:51 Chris Reffett (creffett)
0 siblings, 0 replies; 2+ messages in thread
From: Chris Reffett (creffett) @ 2013-01-22 20:51 UTC (permalink / raw
To: gentoo-commits
creffett 13/01/22 20:51:58
Added: csync-0.70.1-automagicness.patch
Log:
Version bump. Reroll automagic patch, add dev-libs/check dependency
(Portage version: 2.2.0_alpha159/cvs/Linux x86_64, signed Manifest commit with key 42618354)
Revision Changes Path
1.1 net-misc/csync/files/csync-0.70.1-automagicness.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/csync/files/csync-0.70.1-automagicness.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-misc/csync/files/csync-0.70.1-automagicness.patch?rev=1.1&content-type=text/plain
Index: csync-0.70.1-automagicness.patch
===================================================================
--- a/cmake/Modules/MacroOptionalFindPackage.cmake
+++ b/cmake/Modules/MacroOptionalFindPackage.cmake
@@ -0,0 +1,47 @@
+# - MACRO_OPTIONAL_FIND_PACKAGE() combines FIND_PACKAGE() with an OPTION()
+# MACRO_OPTIONAL_FIND_PACKAGE( <name> [QUIT] )
+# This macro is a combination of OPTION() and FIND_PACKAGE(), it
+# works like FIND_PACKAGE(), but additionally it automatically creates
+# an option name WITH_<name>, which can be disabled via the cmake GUI.
+# or via -DWITH_<name>=OFF
+# The standard <name>_FOUND variables can be used in the same way
+# as when using the normal FIND_PACKAGE()
+
+# Copyright (c) 2006-2010 Alexander Neundorf, <neundorf@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+# This is just a helper macro to set a bunch of variables empty.
+# We don't know whether the package uses UPPERCASENAME or CamelCaseName, so we try both:
+macro(_MOFP_SET_EMPTY_IF_DEFINED _name _var)
+ if(DEFINED ${_name}_${_var})
+ set(${_name}_${_var} "")
+ endif(DEFINED ${_name}_${_var})
+
+ string(TOUPPER ${_name} _nameUpper)
+ if(DEFINED ${_nameUpper}_${_var})
+ set(${_nameUpper}_${_var} "")
+ endif(DEFINED ${_nameUpper}_${_var})
+endmacro(_MOFP_SET_EMPTY_IF_DEFINED _package _var)
+
+
+macro (MACRO_OPTIONAL_FIND_PACKAGE _name )
+ option(WITH_${_name} "Search for ${_name} package" ON)
+ if (WITH_${_name})
+ find_package(${_name} ${ARGN})
+ else (WITH_${_name})
+ string(TOUPPER ${_name} _nameUpper)
+ set(${_name}_FOUND FALSE)
+ set(${_nameUpper}_FOUND FALSE)
+
+ _mofp_set_empty_if_defined(${_name} INCLUDE_DIRS)
+ _mofp_set_empty_if_defined(${_name} INCLUDE_DIR)
+ _mofp_set_empty_if_defined(${_name} INCLUDES)
+ _mofp_set_empty_if_defined(${_name} LIBRARY)
+ _mofp_set_empty_if_defined(${_name} LIBRARIES)
+ _mofp_set_empty_if_defined(${_name} LIBS)
+ _mofp_set_empty_if_defined(${_name} FLAGS)
+ _mofp_set_empty_if_defined(${_name} DEFINITIONS)
+ endif (WITH_${_name})
+endmacro (MACRO_OPTIONAL_FIND_PACKAGE)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,7 @@
# add macros
include(MacroAddPlugin)
include(MacroCopyFile)
+include(MacroOptionalFindPackage)
find_package(Iconv)
find_package(CMocka)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -2,7 +2,10 @@
# Build the documentation
#
-include(UseDoxygen OPTIONAL)
+option(WITH_APIDOC "Use doxygen to generate documentation" ON)
+if (WITH_APIDOC)
+ include(UseDoxygen OPTIONAL)
+endif (WITH_APIDOC)
file(GLOB _manpages *.[0-9].txt)
add_custom_target(man
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,8 +1,8 @@
project(modules C)
-find_package(Libsmbclient)
-find_package(LibSSH 0.4.0)
-find_package(Neon)
+macro_optional_find_package(Libsmbclient)
+macro_optional_find_package(LibSSH 0.4.0)
+macro_optional_find_package(Neon)
set(PLUGIN_VERSION_INSTALL_DIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-misc/csync/files: csync-0.70.1-automagicness.patch
@ 2013-04-29 15:53 Michael Palimaka (kensington)
0 siblings, 0 replies; 2+ messages in thread
From: Michael Palimaka (kensington) @ 2013-04-29 15:53 UTC (permalink / raw
To: gentoo-commits
kensington 13/04/29 15:53:42
Removed: csync-0.70.1-automagicness.patch
Log:
Version bump. Remove old.
(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-29 15:53 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-01-22 20:51 [gentoo-commits] gentoo-x86 commit in net-misc/csync/files: csync-0.70.1-automagicness.patch Chris Reffett (creffett)
-- strict thread matches above, loose matches on Subject: below --
2013-04-29 15:53 Michael Palimaka (kensington)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox