[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=7a0557f

The following commit has been merged in the master branch:
commit 7a0557f4827692d45aa3fdb3d9f33d6f365c2e02
Author: Aleix Pol <aleixpol at kde.org>
Date:   Sat Jun 14 16:56:41 2014 +0200

    cmake fixes
    
    Use the new directory structure when installing generated files.
    Remove unneeded add_dependencies calls.
---
 interfaces/CMakeLists.txt                 | 20 ++++++++++----------
 kio/CMakeLists.txt                        |  2 --
 plasmoid/declarativeplugin/CMakeLists.txt |  1 -
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
index 4985376..a708ba1 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
@@ -28,12 +28,12 @@ set(libkdeconnect_HEADERS
     notificationsmodel.h
     dbusinterfaces.h
     ${CMAKE_CURRENT_BINARY_DIR}/kdeconnectinterfaces_export.h
-    ${CMAKE_BINARY_DIR}/libkdeconnect/daemoninterface.h
-    ${CMAKE_BINARY_DIR}/libkdeconnect/deviceinterface.h
-    ${CMAKE_BINARY_DIR}/libkdeconnect/devicebatteryinterface.h
-    ${CMAKE_BINARY_DIR}/libkdeconnect/devicesftpinterface.h
-    ${CMAKE_BINARY_DIR}/libkdeconnect/devicenotificationsinterface.h
-    ${CMAKE_BINARY_DIR}/libkdeconnect/notificationinterface.h
+    ${CMAKE_BINARY_DIR}/interfaces/daemoninterface.h
+    ${CMAKE_BINARY_DIR}/interfaces/deviceinterface.h
+    ${CMAKE_BINARY_DIR}/interfaces/devicebatteryinterface.h
+    ${CMAKE_BINARY_DIR}/interfaces/devicesftpinterface.h
+    ${CMAKE_BINARY_DIR}/interfaces/devicenotificationsinterface.h
+    ${CMAKE_BINARY_DIR}/interfaces/notificationinterface.h
 )
 
 set_source_files_properties(
@@ -77,9 +77,9 @@ target_link_libraries(kdeconnectinterfaces
     ${QJSON_LIBRARIES}
 )
 
-configure_file(KDEConnectConfig.cmake.in ${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfig.cmake @ONLY)
+configure_file(KDEConnectConfig.cmake.in ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake @ONLY)
 
-macro_write_basic_cmake_version_file(${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfigVersion.cmake
+macro_write_basic_cmake_version_file(${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfigVersion.cmake
         ${KDECONNECT_VERSION_MAJOR} ${KDECONNECT_VERSION_MINOR} ${KDECONNECT_VERSION_PATCH})
         
 install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets  ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -87,6 +87,6 @@ install(TARGETS kdeconnectinterfaces EXPORT kdeconnectLibraryTargets  ${INSTALL_
 #Install header files
 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}/libkdeconnect/KDEConnectConfig.cmake
-              ${CMAKE_BINARY_DIR}/libkdeconnect/KDEConnectConfigVersion.cmake
+install(FILES ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfig.cmake
+              ${CMAKE_BINARY_DIR}/interfaces/KDEConnectConfigVersion.cmake
         DESTINATION ${LIB_INSTALL_DIR}/cmake/KDEConnect)
diff --git a/kio/CMakeLists.txt b/kio/CMakeLists.txt
index f0e44fb..f5a202a 100644
--- a/kio/CMakeLists.txt
+++ b/kio/CMakeLists.txt
@@ -6,8 +6,6 @@ set(kio_kdeconnect_PART_SRCS
 
 kde4_add_plugin(kio_kdeconnect ${kio_kdeconnect_PART_SRCS})
 
-add_dependencies(kio_kdeconnect libkdeconnectinterfaces)
-
 target_link_libraries(kio_kdeconnect
     ${KDE4_KDECORE_LIBS}
     ${KDE4_KIO_LIBRARY}
diff --git a/plasmoid/declarativeplugin/CMakeLists.txt b/plasmoid/declarativeplugin/CMakeLists.txt
index c2a0310..615ee53 100644
--- a/plasmoid/declarativeplugin/CMakeLists.txt
+++ b/plasmoid/declarativeplugin/CMakeLists.txt
@@ -15,7 +15,6 @@ set(kdeconnectdeclarativeplugin_MOC
 qt4_wrap_cpp(kdeconnectdeclarativeplugin_SRC ${kdeconnectdeclarativeplugin_MOC})    
 
 kde4_add_library(kdeconnectdeclarativeplugin SHARED ${kdeconnectdeclarativeplugin_SRC})
-add_dependencies(kdeconnectdeclarativeplugin libkdeconnectinterfaces)
 target_link_libraries(kdeconnectdeclarativeplugin
     ${KDE4_KDEUI_LIBS}
     ${KDE4_KDECORE_LIBS}

-- 
kdeconnect packaging