[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    playground/network/kbluetooth
From:       Ingmar Vanhassel <ingmar () exherbo ! org>
Date:       2010-01-22 4:47:51
Message-ID: 1264135671.412798.3085.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1078338 by ingmarvanhassel:

Simplify

 M  +1 -0      CMakeLists.txt  
 M  +2 -8      src/CMakeLists.txt  


--- trunk/playground/network/kbluetooth/CMakeLists.txt #1078337:1078338
@@ -20,6 +20,7 @@
 #In kde 4.3 libKNotification was experimental
 if(${KDE_VERSION} VERSION_LESS 4.3.9)
 	find_package(LibKNotificationItem-1 REQUIRED)
+	set (KBLUETOOTH_LIBKNOTIFICATION ${LIBKNOTIFICATIONITEM-1_LIBRARY})
 endif(${KDE_VERSION} VERSION_LESS 4.3.9)
 
 macro_optional_find_package(Nepomuk)
--- trunk/playground/network/kbluetooth/src/CMakeLists.txt #1078337:1078338
@@ -44,14 +44,8 @@
 
 configure_file(config-nepomuk.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-nepomuk.h)
 
-# If major than 4.3.9 which means 4.4.0 link against KDE4_KDEUI
-if(${KDE_VERSION} VERSION_GREATER 4.3.9)
-	target_link_libraries(kbluetooth
-                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} \
                ${KDE4_KFILE_LIBS} ${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY})
-elseif(${KDE_VERSION} VERSION_GREATER 4.2.9 AND ${KDE_VERSION} VERSION_LESS 4.4.0)
-	target_link_libraries(kbluetooth
-                      ${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} \
                ${KDE4_KFILE_LIBS} ${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY} \
                knotificationitem-1)
-endif(${KDE_VERSION} VERSION_GREATER 4.3.9)
+target_link_libraries(kbluetooth
+	${KDE4_KIO_LIBRARY} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KFILE_LIBS} \
${KDE4WORKSPACE_SOLIDCONTROL_LIBRARY} ${KBLUETOOTH_LIBKNOTIFICATION})  
 if(HAVE_NEPOMUK)
 	target_link_libraries(kbluetooth ${NEPOMUK_LIBRARIES})


[prev in list] [next in list] [prev in thread] [next in thread]