[SCM] ktp-filetransfer-handler packaging branch, master, updated. debian/15.12.1-2-226-g825cd93

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-filetransfer-handler.git;a=commitdiff;h=ec34d0f

The following commit has been merged in the master branch:
commit ec34d0f942ba8b7fbeab2c7a542fa34dcde3fc71
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Thu Sep 13 15:17:01 2012 +0200

    Cleanup cmake stuff
---
 CMakeLists.txt     | 27 +++++++++++++--------------
 src/CMakeLists.txt | 12 ++++++------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 89fdfec..4cdd985 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,28 +2,27 @@ project (ktp-filetransfer-handler)
 
 set(KTP_FILETRANSFER_HANDLER_VERSION "0.5.1")
 
-set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
 
 set(IS_KTP_INTERNAL_MODULE TRUE)
 set(KDE_MIN_VERSION "4.6.0")
 
-find_package (KDE4 ${KDE_MIN_VERSION} REQUIRED)
-find_package (TelepathyQt4 0.9.1 REQUIRED)
-find_package (KTp REQUIRED)
+find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
+find_package(TelepathyQt4 0.9.1 REQUIRED)
+find_package(KTp REQUIRED)
 
-include (CheckIncludeFiles)
-include (KDE4Defaults)
-include (MacroLibrary)
+include(CheckIncludeFiles)
+include(KDE4Defaults)
+include(MacroLibrary)
 
-add_definitions (${KDE4_DEFINITIONS}
-                 -DQT_NO_CAST_FROM_ASCII
-                 -DQT_NO_KEYWORDS
+add_definitions(${KDE4_DEFINITIONS}
+                -DQT_NO_CAST_FROM_ASCII
+                -DQT_NO_KEYWORDS
 )
 
-include_directories (${KDE4_INCLUDES}
-                     ${TELEPATHY_QT4_INCLUDE_DIR}
-                     ${KTP_INCLUDE_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}
+include_directories(${KDE4_INCLUDES}
+                    ${TELEPATHY_QT4_INCLUDE_DIR}
+                    ${KTP_INCLUDE_DIR}
 )
 
 add_subdirectory(src)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1b970e9..ebd892c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-set (ktp_filetransfer_handler_SRCS
-     main.cpp
-     filetransfer-handler.cpp
-     telepathy-base-job.cpp
-     handle-incoming-file-transfer-channel-job.cpp
-     handle-outgoing-file-transfer-channel-job.cpp
+set(ktp_filetransfer_handler_SRCS
+    main.cpp
+    filetransfer-handler.cpp
+    telepathy-base-job.cpp
+    handle-incoming-file-transfer-channel-job.cpp
+    handle-outgoing-file-transfer-channel-job.cpp
 )
 
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)

-- 
ktp-filetransfer-handler packaging