KDE/kdeutils

[Michael Leupold]

SVN commit 963614 by mleupold:

Use the new cmake module for finding libknotificationitem-1.

CCMAIL: kde-utils-devel at kde.org

 M  +3 -24     CMakeLists.txt  
 M  +3 -1      kgpg/CMakeLists.txt  
 M  +1 -6      kwallet/CMakeLists.txt  


--- trunk/KDE/kdeutils/CMakeLists.txt #963613:963614
@@ -4,6 +4,7 @@
 
 # search packages used by KDE
 find_package( KDE4 REQUIRED )
+find_package( LibKNotificationItem-1 REQUIRED )
 
 include( KDE4Defaults )
 include( MacroLibrary )
@@ -16,7 +17,7 @@
 set( CMAKE_REQUIRED_DEFINITIONS ${_KDE4_PLATFORM_DEFINITIONS} )
 
 add_definitions( ${QT_DEFINITIONS} ${KDE4_DEFINITIONS} )
-include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} )
+include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${KNOTIFICATIONITEM_INCLUDE_DIR})
 
 # --- check for dependencies ---
 if(X11_FOUND)
@@ -47,29 +48,7 @@
 endif( UNIX )
 
 macro_optional_add_subdirectory( kcharselect )
-
-####
-# Temporary hack until we have a proper CMake module for libknotificationitem
-####
-
-find_library(KDE4_LIBNOTIFICATIONITEM
-	knotificationitem-1
-	PATHS ${KDE4_LIB_INSTALL_DIR} 
-)
-
-if (KDE4_LIBNOTIFICATIONITEM)
-	macro_optional_add_subdirectory( kgpg )
-	set( KDE4_LIBNOTIFICATION_FOUND true)
-else (KDE4_LIBNOTIFICATIONITEM)
-	set( KDE4_LIBNOTIFICATION_FOUND false)
-endif (KDE4_LIBNOTIFICATIONITEM)
-
-macro_log_feature( KDE4_LIBNOTIFICATION_FOUND "knotificationitem" "KDE4 implementation of new systray protocol." "trunk/extragear/lib/libknotificationitem" FALSE "" "Required for building KGpg.")
-
-####
-# end hack
-####
-
+macro_optional_add_subdirectory( kgpg )
 macro_optional_add_subdirectory( ktimer )
 macro_optional_add_subdirectory( kwallet )
 macro_optional_add_subdirectory( okteta )
--- trunk/KDE/kdeutils/kgpg/CMakeLists.txt #963613:963614
@@ -101,13 +101,15 @@
 
 kde4_add_executable(kgpg ${kgpg_SRCS})
 
+message(${KNOTIFICATIONITEM_LIBRARIES})
+
 target_link_libraries(kgpg
 	${KDE4_KIO_LIBS}
 	${KDE4_KABC_LIBS}
 	${KDE4_KUTILS_LIBS}
 	${KDE4_KPIMUTILS_LIBRARY}
 	${KDE4_SOLID_LIBS}
-	${KDE4_LIBNOTIFICATIONITEM}
+	${KNOTIFICATIONITEM_LIBRARIES}
 )
 
 install(TARGETS kgpg  ${INSTALL_TARGETS_DEFAULT_ARGS} )
--- trunk/KDE/kdeutils/kwallet/CMakeLists.txt #963613:963614
@@ -2,14 +2,9 @@
 
 add_definitions (-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS)
 
-find_package(LibKNotificationItem-1 REQUIRED)
-
 add_subdirectory( icons ) 
 add_subdirectory( konfigurator ) 
 
-
-
-
 ########### next target ###############
 
 set(kwalletmanager_SRCS 
@@ -29,7 +24,7 @@
 
 kde4_add_executable(kwalletmanager ${kwalletmanager_SRCS})
 
-target_link_libraries(kwalletmanager knotificationitem-1 ${KDE4_KDE3SUPPORT_LIBS})
+target_link_libraries(kwalletmanager ${KNOTIFICATIONITEM_LIBRARIES} ${KDE4_KDE3SUPPORT_LIBS})
 
 install(TARGETS kwalletmanager  ${INSTALL_TARGETS_DEFAULT_ARGS} )