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

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


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

The following commit has been merged in the master branch:
commit 42ecb8a93b11f779ea4d193cfb4c891bc8cca467
Author: Alexandr Akulich <akulichalexander at gmail.com>
Date:   Sun Apr 13 13:48:32 2014 +0200

    libkdeconnect: Implemented CMake package configuration files.
    
    Conflicts:
    	libkdeconnect/CMakeLists.txt
---
 libkdeconnect/CMakeLists.txt            | 13 ++++++++++++
 libkdeconnect/KDEConnectConfig.cmake.in | 35 +++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)

diff --git a/libkdeconnect/CMakeLists.txt b/libkdeconnect/CMakeLists.txt
index b65da06..da44ce3 100644
--- a/libkdeconnect/CMakeLists.txt
+++ b/libkdeconnect/CMakeLists.txt
@@ -55,4 +55,17 @@ target_link_libraries(kdeconnect
     ${QJSON_LIBRARIES}
 )
 
+configure_file(KDEConnectConfig.cmake.in ${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfig.cmake @ONLY)
+
+macro_write_basic_cmake_version_file(${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfigVersion.cmake
+        ${KDECONNECT_VERSION_MAJOR} ${KDECONNECT_VERSION_MINOR} ${KDECONNECT_VERSION_PATCH})
+        
 install(TARGETS kdeconnect EXPORT kdeconnectLibraryTargets  ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+#Install header files
+install(FILES ${libkdeconnect_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kdeconnect COMPONENT Devel)
+install(FILES ${libkdeconnect_public_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDEConnect COMPONENT Devel)
+install(FILES ${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfig.cmake
+              ${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfigVersion.cmake
+        DESTINATION ${LIB_INSTALL_DIR}/cmake/KDEConnect)
+
diff --git a/libkdeconnect/KDEConnectConfig.cmake.in b/libkdeconnect/KDEConnectConfig.cmake.in
new file mode 100644
index 0000000..e19d1fd
--- /dev/null
+++ b/libkdeconnect/KDEConnectConfig.cmake.in
@@ -0,0 +1,35 @@
+# Find libkdeconnect
+# Once done this will define
+#
+#  KDECONNECT_FOUND    - system has KDEConnect Library
+#  KDECONNECT_INCLUDES - the KDEConnect include directory
+#  KDECONNECT_LIBS     - link these to use KDEConnect
+
+#  KDECONNECT_VERSION_MAJOR  - the version of the KDEConnect Library
+#  KDECONNECT_VERSION_MINOR  - the version of the KDEConnect Library
+#  KDECONNECT_VERSION_PATCH  - the version of the KDEConnect Library
+#  KDECONNECT_VERSION  - the version of the KDEConnect Library
+
+# Copyright (c) 2014, Alexandr Akulich <akulichalexander at gmail.com>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+
+find_library(KDECONNECT_LIBRARY NAMES kdeconnect HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+
+find_path(KDECONNECT_INCLUDE_DIR NAMES kdeconnect_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} PATH_SUFFIXES kdeconnect)
+get_filename_component(KDECONNECT_INCLUDE_DIR ${KDECONNECT_INCLUDE_DIR} PATH)
+
+if(KDECONNECT_INCLUDE_DIR AND KDECONNECT_LIBRARY)
+   set(KDECONNECT_FOUND TRUE)
+   set(KDECONNECT_LIBS ${kdeconnect_LIB_DEPENDS} ${KDECONNECT_LIBRARY})
+   set(KDECONNECT_INCLUDES ${KDECONNECT_INCLUDE_DIR})
+   set(KDECONNECT_VERSION_MAJOR "@KDECONNECT_VERSION_MAJOR@")
+   set(KDECONNECT_VERSION_MINOR "@KDECONNECT_VERSION_MINOR@")
+   set(KDECONNECT_VERSION_PATCH "@KDECONNECT_VERSION_PATCH@")
+   set(KDECONNECT_VERSION "@KDECONNECT_VERSION@")
+endif(KDECONNECT_INCLUDE_DIR AND KDECONNECT_LIBRARY)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(KDEConnect DEFAULT_MSG KDECONNECT_INCLUDE_DIR KDECONNECT_LIBRARY)
+
+mark_as_advanced(KDECONNECT_INCLUDE_DIR KDECONNECT_LIBRARY)

-- 
kdeconnect packaging



More information about the pkg-kde-commits mailing list