summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleix Pol <[email protected]>2015-04-21 14:11:50 +0200
committerAleix Pol <[email protected]>2015-04-21 14:11:50 +0200
commit8dfac172069cc3cdd9a840562ac51dac59273540 (patch)
tree13d388d38ffac89d811357f0ee3e81375b15b7f2
parent0975201a537504329ff15fe2456821aa3740edac (diff)
Adopt changes in kaccounts-integration
-rw-r--r--CMakeLists.txt3
-rw-r--r--cmake/modules/FindAccountsFileDir.cmake49
2 files changed, 0 insertions, 52 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 08b8ae5..32143fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,9 +16,6 @@ set(IS_KTP_INTERNAL_MODULE TRUE)
find_package (TelepathyQt5 REQUIRED)
find_package (KAccounts REQUIRED)
-find_package (AccountsFileDir REQUIRED)
-find_package (AccountsQt5 1.10 REQUIRED CONFIG)
-find_package (SignOnQt5 8.55 REQUIRED CONFIG)
find_package (Intltool REQUIRED) #needed to generate service and provider files
# make some more macros available
diff --git a/cmake/modules/FindAccountsFileDir.cmake b/cmake/modules/FindAccountsFileDir.cmake
deleted file mode 100644
index ae04ba4..0000000
--- a/cmake/modules/FindAccountsFileDir.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-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 "[\r\n]" " " _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 libaccounts-glib")
-else()
- string(REGEX REPLACE "[\r\n]" " " _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()
-
-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 servicefilesdir for libaccounts-glib")
-else()
- string(REGEX REPLACE "[\r\n]" " " _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_SERVICES_DIR ${_pkgconfig_invoke_result})
-endif()
-
-find_package_handle_standard_args(AccountsFileDir DEFAULT_MSG
- ACCOUNTS_SERVICES_DIR ACCOUNTS_PROVIDERS_DIR)