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

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Ian Monroe <ian.monroe () gmail ! com>
Date:       2009-06-21 20:28:28
Message-ID: 1245616108.346747.15939.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 984978 by ianmonroe:

Revert "Fix compilation without lastfm installed (the cmake log says it's optional)"

Last.fm isn't optional, the cmake foo was just a bit off.

liblastfm now fatal errors if its not found, rather then give a random
error later

 M  +2 -4      CMakeLists.txt  
 M  +5 -3      cmake/modules/FindLibLastFm.cmake  
 M  +1 -4      src/CMakeLists.txt  
 M  +1 -3      src/services/CMakeLists.txt  


--- trunk/extragear/multimedia/amarok/CMakeLists.txt #984977:984978
@@ -53,10 +53,8 @@
     macro_optional_find_package(Strigi)
     macro_log_feature( STRIGI_FOUND "strigi" "Index metadata of files" \
"http://strigi.sourceforge.net" TRUE "" "" )  
-    macro_optional_find_package(LibLastFm)
-    if(LIBLASTFM_FOUND)
-        macro_log_feature( LIBLASTFM_FOUND "liblastfm" "Enable Last.Fm service, \
including scrobbling, song submissions, and suggested song dynamic playlists" \
                "http://cdn.last.fm/src/liblastfm-0.3.0.tar.bz2" FALSE "0.3" "" )
-    endif(LIBLASTFM_FOUND)
+    find_package(LibLastFm REQUIRED)
+    macro_log_feature( LibLastFm_FOUND "liblastfm" "Enable Last.Fm service, \
including scrobbling, song submissions, and suggested song dynamic playlists" \
"http://cdn.last.fm/src/liblastfm-0.3.0.tar.bz2" FALSE "0.3" "" )  
     macro_optional_find_package(Ipod)
     if(IPOD_FOUND)
--- trunk/extragear/multimedia/amarok/cmake/modules/FindLibLastFm.cmake \
#984977:984978 @@ -28,11 +28,13 @@
 
 
 if(LIBLASTFM_INCLUDE_DIR AND LIBLASTFM_LIBRARY)
-   set(LIBLASTFM_FOUND TRUE)
+   set(LibLastFm_FOUND TRUE)
    message(STATUS "Found liblastfm: ${LIBLASTFM_INCLUDE_DIR}, ${LIBLASTFM_LIBRARY}")
 else(LIBLASTFM_INCLUDE_DIR AND LIBLASTFM_LIBRARY)
-   set(LIBLASTFM_FOUND FALSE) 
-   message(STATUS "liblastfm not found.")
+   set(LibLastFm_FOUND FALSE)   
+   if (LibLastFm_FIND_REQUIRED)
+      message(FATAL_ERROR "Could NOT find required package LibLastFm")
+   endif(LibLastFm_FIND_REQUIRED)
 endif(LIBLASTFM_INCLUDE_DIR AND LIBLASTFM_LIBRARY)
 
 mark_as_advanced(LIBLASTFM_INCLUDE_DIR LIBLASTFM_LIBRARY)
--- trunk/extragear/multimedia/amarok/src/CMakeLists.txt #984977:984978
@@ -638,10 +638,7 @@
 install(FILES amarok.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
 install(FILES context/amarokapplets.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
 
-if(LIBLASTFM_FOUND)
-  install(FILES amaroklastfm.protocol DESTINATION ${SERVICES_INSTALL_DIR})
-endif(LIBLASTFM_FOUND)
-
+install(FILES amaroklastfm.protocol DESTINATION ${SERVICES_INSTALL_DIR})
 #install(FILES amarokitpc.protocol DESTINATION ${SERVICES_INSTALL_DIR})
 #install(FILES amarokpcast.protocol DESTINATION ${SERVICES_INSTALL_DIR})
 
--- trunk/extragear/multimedia/amarok/src/services/CMakeLists.txt #984977:984978
@@ -5,7 +5,5 @@
 add_subdirectory( mp3tunes )
 add_subdirectory( ampache )
 add_subdirectory( shoutcast )
-if(LIBLASTFM_FOUND)
-  add_subdirectory( lastfm )
-endif(LIBLASTFM_FOUND)
+add_subdirectory( lastfm )
 add_subdirectory( opmldirectory )


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