[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kaccounts-integration] /: Use the new AccountsQt config in upstream signond/accounts-qt
From:       Àlex_Fiestas <afiestas () kde ! org>
Date:       2014-03-29 11:48:17
Message-ID: E1WTrkH-0007oN-TO () scm ! kde ! org
[Download RAW message or body]

Git commit 8bbe4eae2afe49224296a2e5d5077e7f67538894 by =C3=80lex Fiestas.
Committed on 15/02/2014 at 19:12.
Pushed by afiestas into branch 'master'.

Use the new AccountsQt config in upstream signond/accounts-qt

M  +3    -3    CMakeLists.txt
D  +0    -23   cmake/modules/FindAccountsQt.cmake
D  +0    -20   cmake/modules/FindSignOnQt.cmake

http://commits.kde.org/kaccounts-integration/8bbe4eae2afe49224296a2e5d5077e=
7f67538894

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2183cb7..6c28c02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,8 +9,8 @@ enable_testing()
 find_package(Qt4 REQUIRED)
 find_package(KDE4 REQUIRED)
 find_package(QJSON REQUIRED)
-find_package(AccountsQt REQUIRED)
-find_package(SignOnQt REQUIRED)
+find_package(AccountsQt 1.10 REQUIRED CONFIG)
+find_package(SignOnQt 8.55 REQUIRED CONFIG)
 =

 add_definitions (${KDE4_DEFINITIONS}
                  -fexceptions
@@ -30,4 +30,4 @@ include_directories(${QT_INCLUDES}
 =

 add_subdirectory(src)
 add_subdirectory(icons)
-add_subdirectory(tests)
\ No newline at end of file
+add_subdirectory(tests)
diff --git a/cmake/modules/FindAccountsQt.cmake b/cmake/modules/FindAccount=
sQt.cmake
deleted file mode 100644
index 5addf76..0000000
--- a/cmake/modules/FindAccountsQt.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# - Try to find AccountsQt
-# Once done this will define
-#  ACCOUNTSQT_FOUND - System has libaccounts-qt
-#  ACCOUNTSQT_INCLUDE_DIRS - The libaccounts-qt include directories
-#  ACCOUNTSQT_LIBRARIES - The libraries needed to use libaccounts-qt
-
-find_path(ACCOUNTSQT_INCLUDE_DIR Accounts/Account
-          HINTS ${CMAKE_INSTALL_PREFIX}/include
-          PATH_SUFFIXES accounts-qt )
-
-find_library(ACCOUNTSQT_LIBRARY NAMES accounts-qt libaccounts-qt
-    HINTS ${CMAKE_INSTALL_PREFIX}/lib64)
-
-set(ACCOUNTSQT_LIBRARIES ${ACCOUNTSQT_LIBRARY} )
-set(ACCOUNTSQT_INCLUDE_DIRS ${ACCOUNTSQT_INCLUDE_DIR} )
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set  ACCOUNTSQT_FOUND to T=
RUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(accountsqt  DEFAULT_MSG
-                                  ACCOUNTSQT_LIBRARY ACCOUNTSQT_INCLUDE_DI=
R)
-
-mark_as_advanced(ACCOUNTSQT_INCLUDE_DIR ACCOUNTSQT_LIBRARY )
\ No newline at end of file
diff --git a/cmake/modules/FindSignOnQt.cmake b/cmake/modules/FindSignOnQt.=
cmake
deleted file mode 100644
index 781dffc..0000000
--- a/cmake/modules/FindSignOnQt.cmake
+++ /dev/null
@@ -1,20 +0,0 @@
-# - Try to find SignOnQt
-# Once done this will define
-#  SIGNONQT_FOUND - System has libsignon-qt
-#  SIGNONQT_INCLUDE_DIRS - The libsignon-qt include directories
-#  SIGNONQT_LIBRARIES - The libraries needed to use libsignon-qt
-
-find_path(SIGNONQT_INCLUDE_DIR SignOn/AuthService PATH_SUFFIXES signon-qt )
-
-find_library(SIGNONQT_LIBRARY NAMES signon-qt libsignon-qt)
-
-set(SIGNONQT_LIBRARIES ${SIGNONQT_LIBRARY} )
-set(SIGNONQT_INCLUDE_DIRS ${SIGNONQT_INCLUDE_DIR} )
-
-include(FindPackageHandleStandardArgs)
-# handle the QUIETLY and REQUIRED arguments and set  SIGNONQT_FOUND to TRUE
-# if all listed variables are TRUE
-find_package_handle_standard_args(signonqt  DEFAULT_MSG
-                                  SIGNONQT_LIBRARY SIGNONQT_INCLUDE_DIR)
-
-mark_as_advanced(SIGNONQT_INCLUDE_DIR SIGNONQT_LIBRARY )
\ No newline at end of file

[prev in list] [next in list] [prev in thread] [next in thread]