[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=7ff2a46

The following commit has been merged in the master branch:
commit 7ff2a4628a242194f0f7f2633fe747cd7e5e4a91
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Nov 12 12:31:19 2014 +0100

    Add missing cmake modules
---
 cmake/modules/FindAccountsFileDir.cmake | 30 ++++++++++++++++++++
 cmake/modules/FindIntltool.cmake        | 50 +++++++++++++++++++++++++++++++++
 2 files changed, 80 insertions(+)

diff --git a/cmake/modules/FindAccountsFileDir.cmake b/cmake/modules/FindAccountsFileDir.cmake
new file mode 100644
index 0000000..eec6964
--- /dev/null
+++ b/cmake/modules/FindAccountsFileDir.cmake
@@ -0,0 +1,30 @@
+find_package(PkgConfig REQUIRED)
+
+execute_process(
+    COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=providerfilesdir libaccounts-glib
+    OUTPUT_VARIABLE _pkgconfig_invoke_result
+    RESULT_VARIABLE _pkgconfig_failed)
+
+if (_pkgconfig_failed)
+    message(FAILED "couldn-t find the providerfilesdir for in libaccounts-glib")
+else()
+    string(REGEX REPLACE "[
]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    set(ACCOUNTS_PROVIDERS_DIR ${_pkgconfig_invoke_result})
+endif()
+
+execute_process(
+    COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=servicefilesdir libaccounts-glib
+    OUTPUT_VARIABLE _pkgconfig_invoke_result
+    RESULT_VARIABLE _pkgconfig_failed)
+
+if (_pkgconfig_failed)
+    message(FAILED "couldn-t find the providerfilesdir for in libaccounts-glib")
+else()
+        string(REGEX REPLACE "[
]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+        string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+        set(ACCOUNTS_SERVICES_DIR ${_pkgconfig_invoke_result})
+endif()
+
+find_package_handle_standard_args(AccountsFileDir DEFAULT_MSG
+                                  ACCOUNTS_SERVICES_DIR ACCOUNTS_PROVIDERS_DIR)
\ No newline at end of file
diff --git a/cmake/modules/FindIntltool.cmake b/cmake/modules/FindIntltool.cmake
new file mode 100644
index 0000000..5c426a2
--- /dev/null
+++ b/cmake/modules/FindIntltool.cmake
@@ -0,0 +1,50 @@
+#
+# cmake/Intltool.cmake
+# Copyright (C) 2013, Valama development team
+#
+# Valama is free software: you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Valama is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+##
+find_program(INTLTOOL_EXTRACT_EXECUTABLE intltool-extract)
+find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge)
+mark_as_advanced(INTLTOOL_EXTRACT_EXECUTABLE)
+mark_as_advanced(INTLTOOL_MERGE_EXECUTABLE)
+
+if(INTLTOOL_EXTRACT_EXECUTABLE)
+  execute_process(
+    COMMAND
+      ${INTLTOOL_EXTRACT_EXECUTABLE} "--version"
+    OUTPUT_VARIABLE
+      intltool_version
+    ERROR_QUIET
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+  )
+  if(intltool_version MATCHES "^intltool-extract \(.*\) [0-9]")
+    string(REGEX REPLACE "^intltool-extract \([^\)]*\) ([0-9\.]+[^ 
]*).*" "\1" INTLTOOL_VERSION_STRING "${intltool_version}")
+  endif()
+  unset(intltool_version)
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Intltool
+  REQUIRED_VARS
+    INTLTOOL_EXTRACT_EXECUTABLE
+    INTLTOOL_MERGE_EXECUTABLE
+  VERSION_VAR
+    INTLTOOL_VERSION_STRING
+)
+
+set(INTLTOOL_OPTIONS_DEFAULT
+  "--quiet"
+)
\ No newline at end of file

-- 
ktp-accounts-kcm packaging