X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=ba64d308b9d3ca757c3c30854e439f69d2ded208;hb=86329423d0ea65f95da4d745fd2ac94a416aa27c;hp=22ed37b63f6d9f9182722434583be5875cb0ea1e;hpb=c83a8d90341daba2bc688ad1232dc4b836272235;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 22ed37b6..ba64d308 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,24 +4,25 @@ add_subdirectory( mimetypes )
 
 find_package(Nepomuk REQUIRED)
 
-include_directories(
+include_directories (
+    ${QDBUS_INCLUDE_DIRS} 
+    ${CMAKE_SOURCE_DIR} 
+    ${CMAKE_BINARY_DIR} 
+    ${KDE4_INCLUDES}
+
     ${CMAKE_SOURCE_DIR}/src/widgets
     ${LIBMLT_INCLUDE_DIR}
     ${LIBMLTPLUS_INCLUDE_DIR}
-    ${LIBFFMPEG_INCLUDE_DIR}
-    ${FFMPEG_HEADER_PATH}
     ${NEPOMUK_INCLUDES}
 )
 
 LINK_LIBRARIES(
 ${LIBMLT_LIBRARY}
 ${LIBMLTPLUS_LIBRARY}
-${LIBFFMPEG_LIBRARY}
 ${NEPOMUK_LIBRARIES}
 )
 
 
-
 kde4_add_ui_files(kdenlive_UI
   widgets/timeline_ui.ui
   widgets/monitor_ui.ui
@@ -43,6 +44,7 @@ kde4_add_ui_files(kdenlive_UI
   widgets/wipeval_ui.ui
   widgets/boolval_ui.ui
   widgets/colorval_ui.ui
+  widgets/positionval_ui.ui
   widgets/titlewidget_ui.ui
   widgets/timelinebuttons_ui.ui
   widgets/renderwidget_ui.ui
@@ -58,6 +60,14 @@ kde4_add_ui_files(kdenlive_UI
   widgets/geometryval_ui.ui
   widgets/wizardstandard_ui.ui
   widgets/wizardextra_ui.ui
+  widgets/wizardcheck_ui.ui
+  widgets/wizardmltcheck_ui.ui
+  widgets/spacerdialog_ui.ui
+  widgets/addtrack_ui.ui
+  widgets/dvdwizardvob_ui.ui
+  widgets/dvdwizardmenu_ui.ui
+  widgets/dvdwizardiso_ui.ui
+  widgets/dvdwizardstatus_ui.ui
 )
  
 set(kdenlive_SRCS 
@@ -109,7 +119,6 @@ set(kdenlive_SRCS
   abstractclipitem.cpp
   transitionsettings.cpp
   recmonitor.cpp
-  jogshuttle.cpp
   addtransitioncommand.cpp
   edittransitioncommand.cpp
   addfoldercommand.cpp
@@ -132,25 +141,51 @@ set(kdenlive_SRCS
   abstractgroupitem.cpp
   keyframehelper.cpp
   editclipcommand.cpp
+  insertspacecommand.cpp
+  spacerdialog.cpp
+  addtrackcommand.cpp
+  changetrackcommand.cpp
+  movegroupcommand.cpp
+  dvdwizardvob.cpp
+  dvdwizardmenu.cpp
+  dvdwizard.cpp
+  locktrackcommand.cpp
 )
 
-kde4_add_kcfg_files(kdenlive_SRCS GENERATE_MOC kdenlivesettings.kcfgc )
+add_definitions( ${KDE4_DEFINITIONS} )
 
+if(NO_JOGSHUTTLE)
+  add_definitions(-DNO_JOGSHUTTLE)
+else(NO_JOGSHUTTLE)
+  set(kdenlive_SRCS jogshuttle.cpp ${kdenlive_SRCS})
+endif(NO_JOGSHUTTLE)
+
+kde4_add_kcfg_files(kdenlive_SRCS GENERATE_MOC kdenlivesettings.kcfgc )
+QT4_ADD_DBUS_ADAPTOR(kdenlive_SRCS org.kdenlive.MainWindow.xml mainwindow.h MainWindow)
 kde4_add_executable(kdenlive ${kdenlive_SRCS} ${kdenlive_UI})
 
+
 target_link_libraries(kdenlive 
   ${KDE4_KDEUI_LIBS}
-  ${KDE4_KIO_LIBS} 
+  ${KDE4_KIO_LIBS}
+  ${KDE4_KNEWSTUFF2_LIBS}
   ${LIBMLTPLUS_LIBRARY}
   ${LIBMLT_LIBRARY}
   ${NEPOMUK_LIBRARIES}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
 )
- 
+
+if (APPLE)
+  find_package(SDL REQUIRED)
+  target_link_libraries(kdenlive ${SDL_LIBRARY})
+endif (APPLE)
+
 install(TARGETS kdenlive DESTINATION ${BIN_INSTALL_DIR})
 install( FILES kdenliveui.rc kdenlive.notifyrc DESTINATION  ${DATA_INSTALL_DIR}/kdenlive )
 install (FILES kdenlivesettings.kcfg DESTINATION share/config.kcfg)
 install (FILES kdenlive.desktop DESTINATION share/applications/kde)
 install (FILES application-x-kdenlive.svgz video-mlt-playlist.svgz DESTINATION share/icons/oxygen/scalable/mimetypes)
+install( FILES kdenlive.knsrc  DESTINATION  ${CONFIG_INSTALL_DIR} )
+kde4_install_icons( ${ICON_INSTALL_DIR} )