[SCM] ktp-contact-runner packaging branch, master, updated. debian/15.12.1-2-244-g38a1f58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-runner.git;a=commitdiff;h=a15ae88

The following commit has been merged in the master branch:
commit a15ae88b7b14168611d4e30d8d68507471a2c2b4
Author: Hrvoje Senjan <hrvoje.senjan at gmail.com>
Date:   Tue Oct 28 19:39:28 2014 +0100

    Minor cmake cleanup
    
    drop redundant stuff, be more explicit elsewhere, etc...
    
    REVIEW: 120859
---
 CMakeLists.txt                      | 28 +++++++++------------------
 cmake/modules/COPYING-CMAKE-SCRIPTS | 22 ---------------------
 cmake/modules/FindKTp.cmake         | 38 -------------------------------------
 3 files changed, 9 insertions(+), 79 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 379e8e6..94115bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,36 +3,25 @@ project(KTPContactRunner)
 set(KTP_CONTACT_RUNNER_VERSION "0.7.80")
 set(IS_KTP_INTERNAL_MODULE TRUE)
 
-find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+find_package(ECM 1.0.0 REQUIRED NO_MODULE)
 set (CMAKE_MODULE_PATH
-     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-     ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}
+     ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_MODULE_PATH}
 )
 cmake_policy(SET CMP0002 OLD)
 
 # Find the required Libaries
-find_package (Qt5 REQUIRED CONFIG COMPONENTS Core)
-find_package (KF5 REQUIRED CONFIG COMPONENTS Runner I18n KDE4Support)
-find_package (TelepathyQt5 0.9.2.1 REQUIRED)
+find_package (Qt5 REQUIRED CONFIG COMPONENTS Core DBus Network)
+find_package (KF5 REQUIRED COMPONENTS I18n Service Runner KDELibs4Support)
 find_package (KTp REQUIRED)
 
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDECompilerSettings)
-include(ECMPackageConfigHelpers)
-include(ECMMarkNonGuiExecutable)
-include(ECMPackageConfigHelpers)
-include(ECMInstallIcons)
-include(CMakePackageConfigHelpers)
-include(WriteBasicConfigVersionFile)
-include(CheckIncludeFiles)
 include(FeatureSummary)
 
 include_directories(
    ${CMAKE_SOURCE_DIR}
    ${CMAKE_BINARY_DIR}
-   ${TELEPATHY_QT5_INCLUDE_DIR}
-   ${KTP_INCLUDE_DIR}
    )
 
 # We add our source code here
@@ -40,11 +29,12 @@ set(runner_SRCS src/contactrunner.cpp)
 
 add_library(krunner_ktp_contacts MODULE ${runner_SRCS})
 target_link_libraries(krunner_ktp_contacts
+                      KF5::I18n
+                      KF5::Service
                       KF5::Runner
-                      KF5::KDE4Support
-                      ${TELEPATHY_QT5_LIBRARIES}
-                      ${KTP_MODELS_LIBRARIES}
-                      ${KTP_LIBRARIES})
+                      KF5::KDELibs4Support
+                      KTp::Models
+                      KTp::CommonInternals)
 
 install(TARGETS krunner_ktp_contacts
         DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/cmake/modules/COPYING-CMAKE-SCRIPTS b/cmake/modules/COPYING-CMAKE-SCRIPTS
deleted file mode 100644
index 4b41776..0000000
--- a/cmake/modules/COPYING-CMAKE-SCRIPTS
+++ /dev/null
@@ -1,22 +0,0 @@
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the copyright
-   notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the distribution.
-3. The name of the author may not be used to endorse or promote products 
-   derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/cmake/modules/FindKTp.cmake b/cmake/modules/FindKTp.cmake
deleted file mode 100644
index 8facd12..0000000
--- a/cmake/modules/FindKTp.cmake
+++ /dev/null
@@ -1,38 +0,0 @@
-# Try to find the KTp library
-# KTP_FOUND
-# KTP_INCLUDE_DIR
-# KTP_LIBRARIES
-# KTP_MODELS_LIBRARIES
-# KTP_WIDGETS_LIBRARIES
-
-# Copyright (c) 2011, Dario Freddi <drf at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IS_KTP_INTERNAL_MODULE)
-   message (FATAL_ERROR "KTp can be used just from internal components at this time")
-endif (NOT IS_KTP_INTERNAL_MODULE)
-
-SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
-if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-  # Already in cache, be silent
-  set(KTP_FIND_QUIETLY TRUE)
-endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-
-find_path(KTP_INCLUDE_DIR
-  NAMES KTp/presence.h
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
-find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
-find_library(KTP_WIDGETS_LIBRARIES NAMES ktpwidgetsprivate )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
-                                  KTP_LIBRARIES
-                                  KTP_MODELS_LIBRARIES
-                                  KTP_INCLUDE_DIR)
-
-mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)

-- 
ktp-contact-runner packaging