diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -71,5 +71,3 @@ ${CMAKE_CURRENT_BINARY_DIR}/kaccounts_version.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/KAccounts COMPONENT Devel ) - -add_subdirectory(cmake) diff --git a/src/lib/cmake/CMakeLists.txt b/src/lib/cmake/CMakeLists.txt deleted file mode 100644 --- a/src/lib/cmake/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ -install(FILES FindAccountsFileDir.cmake DESTINATION ${CMAKECONFIG_INSTALL_DIR}) diff --git a/src/lib/cmake/FindAccountsFileDir.cmake b/src/lib/cmake/FindAccountsFileDir.cmake deleted file mode 100644 --- a/src/lib/cmake/FindAccountsFileDir.cmake +++ /dev/null @@ -1,46 +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 - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE) - -if (_pkgconfig_failed) - message(FATAL_ERROR "Couldn't find the prefix for libaccounts-glib") -else() - 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 - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE) - -if (_pkgconfig_failed) - message(FATAL_ERROR "Couldn't find the providerfilesdir for libaccounts-glib") -else() - 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 - OUTPUT_STRIP_TRAILING_WHITESPACE - ERROR_STRIP_TRAILING_WHITESPACE) - -if (_pkgconfig_failed) - message(FATAL_ERROR "Couldn't find the servicefilesdir for libaccounts-glib") -else() - 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()