extragear/multimedia

[Dan Meltzer]

SVN commit 642860 by dmeltzer:

Move Amarok-Centric cmake stuff to the Amarok directory. Please give this some testing
CCMAIL: amarok-devel at kde.org

 M  +0 -15     CMakeLists.txt  
 _M            amarok (directory)  
 M  +16 -6     amarok/CMakeLists.txt  
 A             amarok/cmake (directory)  
 A             amarok/cmake/CMakeLists.txt  
 A             amarok/cmake/modules (directory)  
 A             amarok/cmake/modules/CMakeLists.txt  
 A             amarok/cmake/modules/FindGObject.cmake  
 A             amarok/cmake/modules/FindGStreamer.cmake  
 A             amarok/cmake/modules/FindHelix.cmake  
 A             amarok/cmake/modules/FindIfp.cmake  
 A             amarok/cmake/modules/FindLibvisual.cmake  
 A             amarok/cmake/modules/FindMp4v2.cmake  
 A             amarok/cmake/modules/FindMtp.cmake  
 A             amarok/cmake/modules/FindNjb.cmake  
 A             amarok/cmake/modules/FindSqlite.cmake  
 A             amarok/cmake/modules/FindXine.cmake  
 AM            amarok/cmake/modules/RealPlayerLocation.rb  
 M  +0 -1      amarok/src/CMakeLists.txt  
 D             cmake/CMakeLists.txt  
 D             cmake/modules/CMakeLists.txt  
 D             cmake/modules/FindGObject.cmake  
 D             cmake/modules/FindGStreamer.cmake  
 D             cmake/modules/FindHelix.cmake  
 D             cmake/modules/FindIfp.cmake  
 D             cmake/modules/FindLibvisual.cmake  
 D             cmake/modules/FindMp4v2.cmake  
 D             cmake/modules/FindMtp.cmake  
 D             cmake/modules/FindNjb.cmake  
 D             cmake/modules/FindSqlite.cmake  
 D             cmake/modules/FindXine.cmake  
 D             cmake/modules/RealPlayerLocation.rb  


--- trunk/extragear/multimedia/CMakeLists.txt #642859:642860
@@ -6,23 +6,8 @@
 find_package(KDE4 REQUIRED)
 include (KDE4Defaults)
 include (MacroLibrary)
-find_package(Taglib REQUIRED)
-find_package(RUBY REQUIRED)
-
 include(MacroOptionalAddSubdirectory)
 
-macro_optional_find_package(Njb)
-macro_optional_find_package(Sqlite)
-macro_optional_find_package(Ifp)
-macro_optional_find_package(MySQL)
-macro_optional_find_package(PostgreSQL)
-macro_optional_find_package(Libvisual)
-macro_optional_find_package(Mp4v2)
-macro_optional_find_package(Xine)
-macro_optional_find_package(Helix)
-macro_optional_find_package(Mtp)
-macro_optional_find_package(GObject)
-macro_optional_find_package(GStreamer)
 
 # are these two really required ?
 if (APPLE)
** trunk/extragear/multimedia/amarok #property svnmerge-integrated
   - /branches/work/amarok_uirefactor:1-636766 /trunk/extragear/multimedia/amarok:1-638158
   + /branches/work/amarok_uirefactor:1-636766,639701 /trunk/extragear/multimedia/amarok:1-638158
--- trunk/extragear/multimedia/amarok/CMakeLists.txt #642859:642860
@@ -1,14 +1,24 @@
 project(Amarok)
 
-find_package(KDE4 REQUIRED)
-#following lines are copied from the koffice CMakeLists.txt
-#not sure what they do, but they sound useful. Remove if necessary
-include(KDE4Defaults)
-include(MacroLibrary)
-
 add_definitions(-DQT3_SUPPORT -DQT3_SUPPORT_WARNINGS) 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") #we're still worrying about all the errors
 OPTION(AMAROK_AMAZON_SUPPORT   "Enable Amazon cover download support")
 
+find_package(Taglib REQUIRED)
+find_package(RUBY REQUIRED)
+
+macro_optional_find_package(Njb)
+macro_optional_find_package(Sqlite)
+macro_optional_find_package(Ifp)
+macro_optional_find_package(MySQL)
+macro_optional_find_package(PostgreSQL)
+macro_optional_find_package(Libvisual)
+macro_optional_find_package(Mp4v2)
+macro_optional_find_package(Xine)
+macro_optional_find_package(Helix)
+macro_optional_find_package(Mtp)
+macro_optional_find_package(GObject)
+macro_optional_find_package(GStreamer)
+
 add_subdirectory( src )
 
** trunk/extragear/multimedia/amarok/cmake/modules/RealPlayerLocation.rb #property svn:executable
   + *
--- trunk/extragear/multimedia/amarok/src/CMakeLists.txt #642859:642860
@@ -11,7 +11,6 @@
     MESSAGE(STATUS "You're missing the kdebase header files")
     MESSAGE(STATUS "Konqueror sidebar will not be compiled.")
 endif(KONQSIDEBAR_INCLUDE_DIR)
-
 ADD_DEFINITIONS(${TAGLIB_CFLAGS})
 
 if(MP4V2_FOUND)