[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

Maximiliano Curia maxy at moszumanska.debian.org
Fri Oct 14 14:27:52 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=5bf93af

The following commit has been merged in the master branch:
commit 5bf93af31ebd9a74e1214a4dc31f2530ca9572ff
Author: Christophe Giboudeaux <cgiboudeaux at gmx.com>
Date:   Wed Aug 27 15:35:21 2014 +0200

    Add FindLibFakeKey.cmake.
    
    The build system cannot guess that a new build dependency was added.
---
 cmake/FindLibFakeKey.cmake      | 59 +++++++++++++++++++++++++++++++++++++++++
 plugins/mousepad/CMakeLists.txt |  5 ++--
 2 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/cmake/FindLibFakeKey.cmake b/cmake/FindLibFakeKey.cmake
new file mode 100644
index 0000000..d2413d8
--- /dev/null
+++ b/cmake/FindLibFakeKey.cmake
@@ -0,0 +1,59 @@
+#
+# - Try to find the fakekey library
+# Once done this will define
+#
+#  LibFakeKey_FOUND - system has LibFakeKey
+#  LibFakeKey_INCLUDE_DIRS - the LibFakeKey include directory
+#  LibFakeKey_LIBRARIES - The libraries needed to use LibFakeKey
+#  LibFakeKey_VERSION - The LibFakeKey version
+
+# Copyright (c) 2014 Christophe Giboudeaux <cgiboudeaux at gmx.com>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+find_package(PkgConfig QUIET REQUIRED)
+pkg_check_modules(PC_LibFakeKey libfakekey)
+
+find_path(LibFakeKey_INCLUDE_DIRS
+  NAMES fakekey/fakekey.h
+  HINTS ${PC_LibFakeKey_LIBRARY_DIRS}
+)
+
+find_library(LibFakeKey_LIBRARIES
+  NAMES fakekey
+  HINTS ${PC_LibFakeKey_LIBRARY_DIRS}
+)
+
+set(LibFakeKey_VERSION ${PC_LibFakeKey_VERSION})
+
+include(FindPackageHandleStandardArgs)
+
+find_package_handle_standard_args(LibFakeKey
+    FOUND_VAR LibFakeKey_FOUND
+    REQUIRED_VARS LibFakeKey_LIBRARIES LibFakeKey_INCLUDE_DIRS
+    VERSION_VAR LibFakeKey_VERSION
+)
+
+mark_as_advanced(LibFakeKey_LIBRARIES LibFakeKey_INCLUDE_DIRS LibFakeKey_VERSION)
diff --git a/plugins/mousepad/CMakeLists.txt b/plugins/mousepad/CMakeLists.txt
index b04d0ef..02f36ab 100644
--- a/plugins/mousepad/CMakeLists.txt
+++ b/plugins/mousepad/CMakeLists.txt
@@ -4,16 +4,17 @@ set(kdeconnect_mousepad_SRCS
 
 find_package(XTest REQUIRED)
 find_package(X11 REQUIRED)
+find_package(LibFakeKey REQUIRED)
 
 kde4_add_plugin(kdeconnect_mousepad ${kdeconnect_mousepad_SRCS})
 
-include_directories(${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR})
+include_directories(${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${LibFakeKey_INCLUDE_DIRS})
 
 target_link_libraries(kdeconnect_mousepad kdeconnectcore
     ${QT_QTGUI_LIBRARY}
     ${X11_LIBRARIES}
     ${XTEST_LIBRARIES}
-    fakekey
+    ${LibFakeKey_LIBRARIES}
 )
 
 install(TARGETS kdeconnect_mousepad DESTINATION ${PLUGIN_INSTALL_DIR} )

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list