diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt index 23fc030ae..9fa3bc1d1 100644 --- a/interfaces/CMakeLists.txt +++ b/interfaces/CMakeLists.txt @@ -54,8 +54,6 @@ geninterface(${CMAKE_SOURCE_DIR}/plugins/sms/conversationsdbusinterface.h conver geninterface(${CMAKE_SOURCE_DIR}/plugins/share/shareplugin.h shareinterface) geninterface(${CMAKE_SOURCE_DIR}/plugins/remotesystemvolume/remotesystemvolumeplugin.h remotesystemvolumeinterface) - - add_library(kdeconnectinterfaces SHARED ${libkdeconnect_SRC}) set_target_properties(kdeconnectinterfaces PROPERTIES VERSION ${KDECONNECT_VERSION} @@ -76,19 +74,4 @@ LINK_PRIVATE kdeconnectcore ) -configure_file(KDEConnectConfig.cmake.in ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake @ONLY) - -ecm_setup_version( "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}" VARIABLE_PREFIX KDECONNECTINTERFACES - VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kdeconnectinterfaces_version.h" - PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KDEConnectConfigVersion.cmake" - SOVERSION ${KDECONNECT_VERSION_MAJOR}) - install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS} LIBRARY NAMELINK_SKIP) - -## Don't install header files until API/ABI policy is defined -# -# install(FILES ${libkdeconnect_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/kdeconnect COMPONENT Devel) -# install(FILES ${libkdeconnect_public_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/KDEConnect COMPONENT Devel) -# install(FILES ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake -# ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfigVersion.cmake -# DESTINATION ${LIB_INSTALL_DIR}/cmake/KDEConnect) diff --git a/interfaces/KDEConnectConfig.cmake.in b/interfaces/KDEConnectConfig.cmake.in deleted file mode 100644 index e19d1fdff..000000000 --- a/interfaces/KDEConnectConfig.cmake.in +++ /dev/null @@ -1,35 +0,0 @@ -# Find libkdeconnect -# Once done this will define -# -# KDECONNECT_FOUND - system has KDEConnect Library -# KDECONNECT_INCLUDES - the KDEConnect include directory -# KDECONNECT_LIBS - link these to use KDEConnect - -# KDECONNECT_VERSION_MAJOR - the version of the KDEConnect Library -# KDECONNECT_VERSION_MINOR - the version of the KDEConnect Library -# KDECONNECT_VERSION_PATCH - the version of the KDEConnect Library -# KDECONNECT_VERSION - the version of the KDEConnect Library - -# Copyright (c) 2014, Alexandr Akulich -# -# Redistribution and use is allowed according to the terms of the BSD license. - -find_library(KDECONNECT_LIBRARY NAMES kdeconnect HINTS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR}) - -find_path(KDECONNECT_INCLUDE_DIR NAMES kdeconnect_export.h HINTS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} PATH_SUFFIXES kdeconnect) -get_filename_component(KDECONNECT_INCLUDE_DIR ${KDECONNECT_INCLUDE_DIR} PATH) - -if(KDECONNECT_INCLUDE_DIR AND KDECONNECT_LIBRARY) - set(KDECONNECT_FOUND TRUE) - set(KDECONNECT_LIBS ${kdeconnect_LIB_DEPENDS} ${KDECONNECT_LIBRARY}) - set(KDECONNECT_INCLUDES ${KDECONNECT_INCLUDE_DIR}) - set(KDECONNECT_VERSION_MAJOR "@KDECONNECT_VERSION_MAJOR@") - set(KDECONNECT_VERSION_MINOR "@KDECONNECT_VERSION_MINOR@") - set(KDECONNECT_VERSION_PATCH "@KDECONNECT_VERSION_PATCH@") - set(KDECONNECT_VERSION "@KDECONNECT_VERSION@") -endif(KDECONNECT_INCLUDE_DIR AND KDECONNECT_LIBRARY) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(KDEConnect DEFAULT_MSG KDECONNECT_INCLUDE_DIR KDECONNECT_LIBRARY) - -mark_as_advanced(KDECONNECT_INCLUDE_DIR KDECONNECT_LIBRARY)