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

List:       kde-commits
Subject:    KDE/kdemultimedia/kioslave/audiocd
From:       Trever Fischer <tdfischer () fedoraproject ! org>
Date:       2012-03-29 17:42:12
Message-ID: 20120329174212.C139BAC899 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1287573 by tdfischer:

Get the audiocd kio to build outside of a kdemm checkout

 M  +21 -8     CMakeLists.txt  
 M  +2 -3      audiocd.cpp  
 A             cmake (directory)  
 A             cmake/FindCdparanoia.cmake  
 M  +1 -1      plugins/lame/encoderlame.cpp  


--- trunk/KDE/kdemultimedia/kioslave/audiocd/CMakeLists.txt #1287572:1287573
@@ -1,5 +1,18 @@
 project(audiocd)
 
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+
+find_package(Qt4 REQUIRED)
+find_package(KDE4 REQUIRED)
+include(KDE4Defaults)
+include(MacroLibrary)
+include(CheckStructMember)
+
+find_package(Libkcddb)
+find_package(Libkcompactdisc)
+
+find_package(Cdparanoia)
+
 MACRO_PUSH_REQUIRED_VARS()
 SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/include/cdda)
 check_struct_member("struct cdrom_drive" "ioctl_device_name" "cdda_interface.h" \
CDDA_IOCTL_DEVICE_EXISTS) @@ -11,20 +24,20 @@
 
 #############################
 
+include_directories(
+    ${KDE4_INCLUDES}
+    ${QT_INCLUDES}
+		${CDPARANOIA_INCLUDE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}
+		)
 
+
 add_subdirectory( plugins )
 add_subdirectory( kcmaudiocd )
 add_subdirectory( data )
 
-include_directories(
-		${CMAKE_SOURCE_DIR}/libkcddb
-		${CMAKE_BINARY_DIR}/libkcddb
-		${CMAKE_SOURCE_DIR}/libkcompactdisc
-		${CMAKE_BINARY_DIR}/libkcompactdisc
-		${CDPARANOIA_INCLUDE_DIR}
-		)
 
-
 ########### next target ###############
 
 set(kio_audiocd_PART_SRCS audiocd.cpp )
--- trunk/KDE/kdemultimedia/kioslave/audiocd/audiocd.cpp #1287572:1287573
@@ -22,7 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
-#include <config.h>
 #include <config-audiocd.h>
 
 #include <kdemacros.h>
@@ -57,8 +56,8 @@
 #include <QRegExp>
 #include <QHash>
 // CDDB
-#include <client.h>
-#include "kcompactdisc.h"
+#include <libkcddb/client.h>
+#include <libkcompactdisc/kcompactdisc.h>
 
 using namespace KIO;
 
--- trunk/KDE/kdemultimedia/kioslave/audiocd/plugins/lame/encoderlame.cpp \
#1287572:1287573 @@ -16,7 +16,7 @@
   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 */
 
-#include <config.h>
+#include "config-audiocd.h"
 
 #include "encoderlame.h"
 #include "audiocd_lame_encoder.h"


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