[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=4945dca

The following commit has been merged in the master branch:
commit 4945dca53ad5c423f2f58f938fdb14c735c2a1db
Author: Anant Kamath <kamathanant at gmail.com>
Date:   Tue Sep 3 01:40:29 2013 +0530

    Skip building pintxo plugin if libmm-qt is not found instead of stopping build
---
 plugins/pintxo/CMakeLists.txt | 99 +++++++++++++++++++++----------------------
 1 file changed, 49 insertions(+), 50 deletions(-)

diff --git a/plugins/pintxo/CMakeLists.txt b/plugins/pintxo/CMakeLists.txt
index dc19015..f585602 100644
--- a/plugins/pintxo/CMakeLists.txt
+++ b/plugins/pintxo/CMakeLists.txt
@@ -2,53 +2,52 @@ project (ktpaccountskcm-plugin-pintxo)
 
 INCLUDE(FindPkgConfig)
 
-pkg_check_modules(LIBMODEMMANAGERQT REQUIRED ModemManagerQt)
-    if (NOT LIBMODEMMANAGERQT_FOUND)
-    message(FATAL_ERROR "ERROR: libModemManagerQt not found")
-endif (NOT LIBMODEMMANAGERQT_FOUND)
-
-include_directories (${CMAKE_CURRENT_BINARY_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}
-                     ${QT_INCLUDES}
-                     ${LIBMODEMMANAGERQT_INCLUDE_DIRS}
-                     ${CMAKE_INCLUDE_PATH}
-)
-
-link_directories(${LIBMODEMMANAGERQT_LIBRARY_DIRS})
-
-set (ktpaccountskcm_plugin_pintxo_SRCS
-     pintxo-account-ui-plugin.cpp
-     pintxo-account-ui.cpp
-     main-options-widget.cpp
-     modem-combobox.cpp
-)
-
-kde4_add_ui_files (ktpaccountskcm_plugin_pintxo_SRCS
-                   main-options-widget.ui
-)
-
-kde4_add_plugin (ktpaccountskcm_plugin_pintxo
-                 ${ktpaccountskcm_plugin_pintxo_SRCS}
-)
-
-
-target_link_libraries (ktpaccountskcm_plugin_pintxo
-                       ktpaccountskcminternal
-                       ModemManagerQt
-                       ${QT_LIBRARIES}
-                       ${KDE4_KDEUI_LIBS}
-                       ${TELEPATHY_QT4_LIBRARIES}
-)
-
-# Install:
-install (TARGETS ktpaccountskcm_plugin_pintxo
-         DESTINATION ${PLUGIN_INSTALL_DIR}
-)
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ktpaccountskcm_plugin_pintxo.desktop.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/ktpaccountskcm_plugin_pintxo.desktop
-               @ONLY)
-
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/ktpaccountskcm_plugin_pintxo.desktop
-         DESTINATION ${SERVICES_INSTALL_DIR}
-)
+pkg_check_modules(LIBMODEMMANAGERQT ModemManagerQt)
+    if (LIBMODEMMANAGERQT_FOUND)
+    include_directories (${CMAKE_CURRENT_BINARY_DIR}
+                        ${CMAKE_CURRENT_SOURCE_DIR}
+                        ${QT_INCLUDES}
+                        ${LIBMODEMMANAGERQT_INCLUDE_DIRS}
+                        ${CMAKE_INCLUDE_PATH}
+    )
+
+    link_directories(${LIBMODEMMANAGERQT_LIBRARY_DIRS})
+
+    set (ktpaccountskcm_plugin_pintxo_SRCS
+        pintxo-account-ui-plugin.cpp
+        pintxo-account-ui.cpp
+        main-options-widget.cpp
+        modem-combobox.cpp
+    )
+
+    kde4_add_ui_files (ktpaccountskcm_plugin_pintxo_SRCS
+                    main-options-widget.ui
+    )
+
+    kde4_add_plugin (ktpaccountskcm_plugin_pintxo
+                    ${ktpaccountskcm_plugin_pintxo_SRCS}
+    )
+
+
+    target_link_libraries (ktpaccountskcm_plugin_pintxo
+                        ktpaccountskcminternal
+                        ModemManagerQt
+                        ${QT_LIBRARIES}
+                        ${KDE4_KDEUI_LIBS}
+                        ${TELEPATHY_QT4_LIBRARIES}
+    )
+
+    # Install:
+    install (TARGETS ktpaccountskcm_plugin_pintxo
+            DESTINATION ${PLUGIN_INSTALL_DIR}
+    )
+
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/ktpaccountskcm_plugin_pintxo.desktop.cmake
+                ${CMAKE_CURRENT_BINARY_DIR}/ktpaccountskcm_plugin_pintxo.desktop
+                @ONLY)
+
+    install (FILES ${CMAKE_CURRENT_BINARY_DIR}/ktpaccountskcm_plugin_pintxo.desktop
+            DESTINATION ${SERVICES_INSTALL_DIR}
+    )
+
+endif (LIBMODEMMANAGERQT_FOUND)

-- 
ktp-accounts-kcm packaging