summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Klapetek <[email protected]>2015-03-09 14:40:03 +0100
committerMartin Klapetek <[email protected]>2015-03-09 14:40:03 +0100
commit974c1cf1f00fad833b22f841461f0ed61f1fd409 (patch)
tree63093ca46ddf967cdde0da23054e8325889e6030
parent39e6288d91ae2e9d0be523d824e68a609a688a0e (diff)
Use the installed cmake file for KAccounts
-rw-r--r--cmake/modules/FindKAccounts.cmake30
-rw-r--r--plugins/kaccounts/CMakeLists.txt3
2 files changed, 1 insertions, 32 deletions
diff --git a/cmake/modules/FindKAccounts.cmake b/cmake/modules/FindKAccounts.cmake
deleted file mode 100644
index 4b6c829..0000000
--- a/cmake/modules/FindKAccounts.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# Try to find the KAccounts UI library
-#
-# Copyright (c) 2011, Dario Freddi <[email protected]>
-# Copyright (c) 2014, Martin Klapetek <[email protected]>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-SET (KACCOUNTS_FIND_REQUIRED ${KAccounts_FIND_REQUIRED})
-if (KACCOUNTS_INCLUDE_DIR AND KACCOUNTS_LIBRARY)
- # Already in cache, be silent
- set(KACCOUNTS_FIND_QUIETLY TRUE)
-endif (KACCOUNTS_INCLUDE_DIR AND KACCOUNTS_LIBRARY)
-
-find_path(KACCOUNTS_INCLUDE_DIR
- NAMES KAccounts/kaccountsuiplugin.h
- PATHS ${CMAKE_INSTALL_FULL_INCLUDEDIR}
-)
-
-find_library(KACCOUNTS_LIBRARY NAMES kaccounts)
-
-set(KACCOUNTS_INCLUDE_DIRS ${KACCOUNTS_INCLUDE_DIR})
-set(KACCOUNTS_LIBRARIES ${KACCOUNTS_LIBRARY})
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KAccounts DEFAULT_MSG
- KACCOUNTS_LIBRARY
- KACCOUNTS_INCLUDE_DIR)
-
-mark_as_advanced(KACCOUNTS_INCLUDE_DIR KACCOUNTS_LIBRARY)
diff --git a/plugins/kaccounts/CMakeLists.txt b/plugins/kaccounts/CMakeLists.txt
index f5828c8..3504d0f 100644
--- a/plugins/kaccounts/CMakeLists.txt
+++ b/plugins/kaccounts/CMakeLists.txt
@@ -2,7 +2,6 @@ project (ktpaccountskcm-plugin-kaccounts)
include_directories (${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${KACCOUNTS_INCLUDE_DIR}
${ACCOUNTSQT_INCLUDE_DIRS}
${SIGNONQT_INCLUDE_DIRS}
@@ -22,7 +21,7 @@ target_link_libraries (ktpaccountskcm_plugin_kaccounts
Qt5::Widgets
KF5::TextWidgets
${TELEPATHY_QT5_LIBRARIES}
- ${KACCOUNTS_LIBRARIES}
+ KAccounts
${ACCOUNTSQT_LIBRARIES}
${SIGNONQT_LIBRARIES}
)