summaryrefslogtreecommitdiff
path: root/kde-active/bodega-client/files/bodega-client-1.0-fixautomagicness.patch
diff options
context:
space:
mode:
Diffstat (limited to 'kde-active/bodega-client/files/bodega-client-1.0-fixautomagicness.patch')
-rw-r--r--kde-active/bodega-client/files/bodega-client-1.0-fixautomagicness.patch85
1 files changed, 85 insertions, 0 deletions
diff --git a/kde-active/bodega-client/files/bodega-client-1.0-fixautomagicness.patch b/kde-active/bodega-client/files/bodega-client-1.0-fixautomagicness.patch
new file mode 100644
index 00000000000..2fe552529fa
--- /dev/null
+++ b/kde-active/bodega-client/files/bodega-client-1.0-fixautomagicness.patch
@@ -0,0 +1,85 @@
+--- a/cmake/Modules/MacroOptionalFindPackage.cmake
++++ b/cmake/Modules/MacroOptionalFindPackage.cmake
+@@ -0,0 +1,46 @@
++# 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/lib/bodega/handlers/epub/CMakeLists.txt
++++ b/lib/bodega/handlers/epub/CMakeLists.txt
+@@ -6,8 +6,8 @@
+
+ include("../../CMakeQtUsage")
+
+-find_package(Nepomuk)
+-find_package(Soprano)
++macro_optional_find_package(Nepomuk)
++macro_optional_find_package(Soprano)
+
+ set (bookhandlerplugin_SRCS
+ bookhandler.cpp
+
+--- a/lib/bodega/CMakeLists.txt
++++ b/lib/bodega/CMakeLists.txt
+@@ -1,6 +1,4 @@
+
+-find_package(QJSON)
+-
+ set (bodega_HEADERS
+ assetjob.h
+ assetoperations.h
+
+--- a/lib/CMakeLists.txt
++++ b/lib/CMakeLists.txt
+@@ -16,6 +16,8 @@
+
+ set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
+
++include(MacroOptionalFindPackage)
++
+ # compile in debug mode
+ IF(NOT CMAKE_BUILD_TYPE)
+ SET(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING