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

List:       kde-commits
Subject:    KDE/kdemultimedia
From:       Laurent Montel <montel () kde ! org>
Date:       2009-06-26 7:16:58
Message-ID: 1246000618.807496.8349.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 987471 by mlaurent:

now we use kde4.4 libknotification is by default


 M  +3 -7      CMakeLists.txt  


--- trunk/KDE/kdemultimedia/CMakeLists.txt #987470:987471
@@ -7,6 +7,7 @@
 include(KDE4Defaults)
 include(MacroLibrary)
 find_package(Alsa)
+find_package( LibKNotificationItem-1 REQUIRED )
 
 set(PULSEAUDIO_MINIMUM_VERSION "0.9.12")
 macro_optional_find_package(PulseAudio)
@@ -26,7 +27,7 @@
 macro_optional_find_package(OggVorbis)
 macro_log_feature(OGGVORBIS_FOUND "OggVorbis" "Libraries for Ogg Vorbis general \
audio compression codec" "http://www.xiph.org" FALSE "" "Required for the AudioCD Ogg \
Vorbis plugin.")  
-add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS})
+add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} ${KDE4_DEFINITIONS} )
 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 if(MSVC)
     include_directories( ${TAGLIB_INCLUDES} )
@@ -55,12 +56,7 @@
 macro_optional_add_subdirectory(kioslave)
 
 if(NOT WIN32)
-  find_package(LibKNotificationItem-1)
-  macro_log_feature(LIBKNOTIFICATIONITEM-1_FOUND "LibKNotificationItem-1" "An \
experimental library" "svn://anonsvn.kde.org/home/kde/trunk/KDE/kdelibs/experimental" \
                TRUE "" "LibKNotificationItem-1 is an unfinished library which is \
                required by kmix.")
-
-  if (LIBKNOTIFICATIONITEM-1_FOUND)
-     macro_optional_add_subdirectory(kmix)
-  endif (LIBKNOTIFICATIONITEM-1_FOUND)
+  macro_optional_add_subdirectory(kmix)
 endif(NOT WIN32)
 macro_optional_add_subdirectory(dragonplayer)
 


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