[SCM] Kingston update notifier (update-notifier-kde) branch, master, updated. 213ebd6609698a9849f52a35a166ea877db74952

[Kai Wasserbäch]

The following commit has been merged in the master branch:
commit 213ebd6609698a9849f52a35a166ea877db74952
Author: Kai Wasserbäch <curan at debian.org>
Date:   Mon Feb 14 10:52:48 2011 +0100

    src/CMakeLists.txt: Ensure minimal linking.
    
    We use -Wl,--as-needed mainly because of libgcc_s, otherwise a better
    tuned target_link_libraries() would be better. But as we need libgcc_s
    on some arches this is probably the easiest way to get minimal
    linking.
---
 debian/changelog   |    6 ++++++
 src/CMakeLists.txt |   12 ++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7e0df7a..0460f99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+kingston-update-notifier (1.2.2) UNRELEASED; urgency=low
+
+  * src/CMakeLists.txt: Ensure minimal linking.
+
+ -- Kai Wasserbäch <curan at debian.org>  Mon, 14 Feb 2011 10:42:55 +0100
+
 kingston-update-notifier (1.2.1) unstable; urgency=low
 
   [ Pino Toscano ]
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 947ef16..f08820e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,11 +9,19 @@ kde4_add_executable(testapp_kingston testapp_main.cpp test_window.cpp ${kingston
 target_link_libraries(testapp_kingston ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} )
 
 kde4_add_plugin(kded_kingston_update_notifier kingston_update_notifier_module.cpp ${kingston_SRCS})
+# for our builds this should be always true
+if(CMAKE_COMPILER_IS_GNUCXX)
+        set(MINIMAL_LINKING "-Wl,--no-undefined -Wl,--as-needed")
+else(CMAKE_COMPILER_IS_GNUCXX)
+        set(MINIMAL_LINKING)
+endif(CMAKE_COMPILER_IS_GNUCXX)
 target_link_libraries(kded_kingston_update_notifier ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} )
-
+set_target_properties(kded_kingston_update_notifier PROPERTIES
+        LINK_FLAGS "${MINIMAL_LINKING}"
+        )
 
 ########### install files ###############
 
 install( FILES kingston_update_notifier.desktop  DESTINATION ${SERVICES_INSTALL_DIR}/kded )
 install( TARGETS kded_kingston_update_notifier DESTINATION  ${PLUGIN_INSTALL_DIR})
-install( FILES kingston_update_notifier.notifyrc  DESTINATION  ${DATA_INSTALL_DIR}/kingston_update_notifier )
\ No newline at end of file
+install( FILES kingston_update_notifier.notifyrc  DESTINATION  ${DATA_INSTALL_DIR}/kingston_update_notifier )

-- 
Kingston update notifier (update-notifier-kde)