[amarok] all media devices ported to cmake

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1230244 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 13 insertions, 13 deletions

diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 5c71a919..0e143112 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -112,32 +112,32 @@ if( WITH_XINE )
       tde_message_fatal( "your xine version is too old; at least 1.0.2 is required" )
     endif( )
   else( )
-    tde_message_fatal( "xine are requested, but not found on your system" )
+    tde_message_fatal( "xine is requested, but was not found on your system" )
   endif( )
 endif( )
 
 
 # iPod
-if( WITH_LIBGPOD )
+if( WITH_IPOD )
 
-#  tde_message_fatal( "iPod support is outdated, cannot be compiled against newer libgpod" )
-
-  pkg_search_module( LIBGPOD libgpod-1.0 )
-  if( LIBGPOD_FOUND )
-    if( ${LIBGPOD_VERSION} VERSION_LESS "0.4.2" )
+  pkg_search_module( GPOD libgpod-1.0 )
+  if( GPOD_FOUND )
+    if( ${GPOD_VERSION} VERSION_LESS "0.4.2" )
       tde_message_fatal( "your libgpod version is too old; at least 0.4.2 is required" )
-    elseif( NOT ${LIBGPOD_VERSION} VERSION_LESS "0.6.0" )
-      set( HAVE_LIBGPOD_060 1 )
+    elseif( NOT ${GPOD_VERSION} VERSION_LESS "0.6.0" )
+      set( HAVE_GPOD_060 1 )
     endif( )
   else( )
-    tde_message_fatal( "libgpod-1.0 are requested, but not found on your system" )
+    tde_message_fatal( "libgpod-1.0 is requested, but was not found on your system" )
   endif( )
 
   tde_save( CMAKE_REQUIRED_INCLUDES )
-  set( CMAKE_REQUIRED_INCLUDES ${LIBGPOD_INCLUDE_DIRS} )
+  set( CMAKE_REQUIRED_INCLUDES ${GPOD_INCLUDE_DIRS} )
   check_struct_has_member( "struct _Itdb_Track" mediatype "gpod/itdb.h" HAVE_ITDB_MEDIATYPE )
   tde_restore( CMAKE_REQUIRED_INCLUDES )
 
+  set( GPOD_LIBRARY gpod )
+
 endif( )
 
 
@@ -159,7 +159,7 @@ tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
 
 # konqsidebarplugin.h
 if( WITH_KONQSIDEBAR )
-  tde_save( CMAKE_REQUIRED_DEFINITIONS CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES CMAKE_REQUIRED_LIBRARIES )
+  tde_save( CMAKE_REQUIRED_DEFINITIONS CMAKE_REQUIRED_FLAGS CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
   set( CMAKE_REQUIRED_DEFINITIONS ${TQT_CFLAGS_OTHER} )
   set( CMAKE_REQUIRED_INCLUDES ${TDE_INCLUDE_DIR};${TQT_INCLUDE_DIRS};${CMAKE_INCLUDE_PATH} )
   set( CMAKE_REQUIRED_FLAGS "-include tqt.h" )
@@ -168,7 +168,7 @@ if( WITH_KONQSIDEBAR )
     #include <konqsidebarplugin.h>
     int main(int, char**) { return 0; } "
     HAVE_KONQSIDEBARPLUGIN_H )
-  tde_restore( CMAKE_REQUIRED_DEFINITIONS CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES CMAKE_REQUIRED_LIBRARIES )
+  tde_restore( CMAKE_REQUIRED_DEFINITIONS CMAKE_REQUIRED_FLAGS CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES )
   if( NOT HAVE_KONQSIDEBARPLUGIN_H )
     tde_message_fatal( "konqsidebarplugin.h are requested, but not found on your system" )
   endif( )