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

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:06:21 UTC 2016


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

The following commit has been merged in the master branch:
commit 6b5ae219fe574864bb921c61d5f3c837c2d18a8e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Feb 26 15:18:16 2015 +0100

    [kaccounts] Update the FindAccoutnsFileDir
---
 cmake/modules/FindAccountsFileDir.cmake | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/cmake/modules/FindAccountsFileDir.cmake b/cmake/modules/FindAccountsFileDir.cmake
index eec6964..db658f0 100644
--- a/cmake/modules/FindAccountsFileDir.cmake
+++ b/cmake/modules/FindAccountsFileDir.cmake
@@ -1,15 +1,31 @@
 find_package(PkgConfig REQUIRED)
 
 execute_process(
+    COMMAND "${PKG_CONFIG_EXECUTABLE}" --variable=prefix libaccounts-glib
+    OUTPUT_VARIABLE _pkgconfig_invoke_result
+    RESULT_VARIABLE _pkgconfig_failed)
+
+if (_pkgconfig_failed)
+    message(FAILED "Couldn't find the prefix for libaccounts-glib")
+else()
+    string(REGEX REPLACE "[
]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    set(ACCOUNTS_PREFIX_DIR ${_pkgconfig_invoke_result})
+endif()
+
+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")
+    message(FAILED "Couldn't find the providerfilesdir for libaccounts-glib")
 else()
     string(REGEX REPLACE "[
]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
     string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+        string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    endif()
     set(ACCOUNTS_PROVIDERS_DIR ${_pkgconfig_invoke_result})
 endif()
 
@@ -19,12 +35,16 @@ execute_process(
     RESULT_VARIABLE _pkgconfig_failed)
 
 if (_pkgconfig_failed)
-    message(FAILED "couldn-t find the providerfilesdir for in libaccounts-glib")
+    message(FAILED "Couldn't find the servicefilesdir for 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})
+    string(REGEX REPLACE "[
]"                  " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    string(REGEX REPLACE " +$"                     ""  _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    if (NOT CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+        message("yooo")
+        string(REPLACE ${ACCOUNTS_PREFIX_DIR} ${CMAKE_INSTALL_PREFIX} _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
+    endif()
+    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
+                                  ACCOUNTS_SERVICES_DIR ACCOUNTS_PROVIDERS_DIR)

-- 
ktp-accounts-kcm packaging



More information about the pkg-kde-commits mailing list