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

List:       kde-commits
Subject:    KDE/kdemultimedia
From:       Alexander Neundorf <neundorf () kde ! org>
Date:       2009-05-18 21:06:37
Message-ID: 1242680797.408211.1721.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 969769 by neundorf:

-add a separate copy of FindLibKNotificationItem-1.cmake, same as in other modules

Alex




 M  +6 -2      CMakeLists.txt  
 AM            cmake/modules/FindLibKNotificationItem-1.cmake  
 M  +2 -2      kmix/CMakeLists.txt  


--- trunk/KDE/kdemultimedia/CMakeLists.txt #969768:969769
@@ -27,7 +27,7 @@
 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})
-include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} \
${KDE4_INCLUDES}) +include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} \
${KDE4_INCLUDES})  if(MSVC)
     include_directories( ${TAGLIB_INCLUDES} )
 endif(MSVC)
@@ -50,13 +50,17 @@
      macro_optional_add_subdirectory(kscd)
   endif(MUSICBRAINZ_FOUND)
 endif (NOT APPLE)
+
 macro_optional_add_subdirectory(strigi-analyzer)
 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.") \
                
-  macro_optional_add_subdirectory(kmix)
+  if (LIBKNOTIFICATIONITEM-1_FOUND)
+     macro_optional_add_subdirectory(kmix)
+  endif (LIBKNOTIFICATIONITEM-1_FOUND)
 endif(NOT WIN32)
 macro_optional_add_subdirectory(dragonplayer)
 
** trunk/KDE/kdemultimedia/cmake/modules/FindLibKNotificationItem-1.cmake #property \
svn:eol-style  + native
--- trunk/KDE/kdemultimedia/kmix/CMakeLists.txt #969768:969769
@@ -1,6 +1,6 @@
 project(kmix)
 
-include_directories( ${GLIB2_INCLUDE_DIR} ${KNOTIFICATIONITEM_INCLUDE_DIR} )
+include_directories( ${GLIB2_INCLUDE_DIR} ${LIBKNOTIFICATIONITEM-1_INCLUDE_DIR} )
 
 add_subdirectory( pics ) 
 add_subdirectory( profiles ) 
@@ -39,7 +39,7 @@
 
 kde4_add_kdeinit_executable( kmix ${kmix_KDEINIT_SRCS})
 
-target_link_libraries(kdeinit_kmix ${KNOTIFICATIONITEM_LIBRARIES} \
${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} \
${QT_QTXML_LIBRARY}) +target_link_libraries(kdeinit_kmix \
${LIBKNOTIFICATIONITEM-1_LIBRARIES} ${KDE4_KUTILS_LIBS} ${KDE4_PHONON_LIBS} \
${KDE4_SOLID_LIBS} ${KDE4_KDEUI_LIBS} ${QT_QTXML_LIBRARY})  
 if (HAVE_LIBASOUND2)
     target_link_libraries(kdeinit_kmix ${ASOUND_LIBRARY})


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