X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=f2fa89f86e3f99ffb26667af0b19d12acb432d4e;hb=99aa6b9d23d0a3b603b71d1e2feba0041ea3e3f5;hp=a2004419b20519a1890ef6dc48e1e6ee073ea839;hpb=73635fd77a43f745e41c6ab325d70c3fe6603dd3;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2004419..f2fa89f8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -5,14 +5,16 @@ add_subdirectory( mimetypes )
 find_package(Nepomuk REQUIRED)
 
 include_directories (
-    ${QDBUS_INCLUDE_DIRS} 
-    ${CMAKE_SOURCE_DIR} 
-    ${CMAKE_BINARY_DIR} 
-    ${KDE4_INCLUDES}
-
-    ${CMAKE_SOURCE_DIR}/src/widgets
+    ${KDE4_INCLUDE_DIR}
+    ${KDE4_INCLUDE_DIR}/KDE
+    ${QT_INCLUDES}
     ${LIBMLT_INCLUDE_DIR}
     ${LIBMLTPLUS_INCLUDE_DIR}
+    ${QDBUS_INCLUDE_DIRS}
+    ${CMAKE_SOURCE_DIR}
+    ${CMAKE_BINARY_DIR}
+
+    ${CMAKE_SOURCE_DIR}/src/widgets
     ${NEPOMUK_INCLUDES}
 )
 
@@ -34,6 +36,7 @@ kde4_add_ui_files(kdenlive_UI
   widgets/configdisplay_ui.ui
   widgets/configsdl_ui.ui
   widgets/configcapture_ui.ui
+  widgets/configtranscode_ui.ui
   widgets/effectlist_ui.ui
   widgets/effectstack_ui.ui
   widgets/profiledialog_ui.ui
@@ -66,11 +69,14 @@ kde4_add_ui_files(kdenlive_UI
   widgets/addtrack_ui.ui
   widgets/dvdwizardvob_ui.ui
   widgets/dvdwizardmenu_ui.ui
-  widgets/dvdwizardiso_ui.ui
   widgets/dvdwizardstatus_ui.ui
+  widgets/dvdwizardchapters_ui.ui
+  widgets/missingclips_ui.ui
+  widgets/cliptranscode_ui.ui
+  widgets/geometryposition_ui.ui
 )
- 
-set(kdenlive_SRCS 
+
+set(kdenlive_SRCS
   addclipcommand.cpp
   main.cpp
   mainwindow.cpp
@@ -152,6 +158,11 @@ set(kdenlive_SRCS
   locktrackcommand.cpp
   groupclipscommand.cpp
   splitaudiocommand.cpp
+  changecliptypecommand.cpp
+  documentchecker.cpp
+  dvdwizardchapters.cpp
+  documentvalidator.cpp
+  cliptranscode.cpp
 )
 
 add_definitions( ${KDE4_DEFINITIONS} )
@@ -162,12 +173,12 @@ else(NO_JOGSHUTTLE)
   set(kdenlive_SRCS jogshuttle.cpp ${kdenlive_SRCS})
 endif(NO_JOGSHUTTLE)
 
-kde4_add_kcfg_files(kdenlive_SRCS GENERATE_MOC kdenlivesettings.kcfgc )
+kde4_add_kcfg_files(kdenlive_SRCS 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 
+target_link_libraries(kdenlive
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
   ${KDE4_KNEWSTUFF2_LIBS}
@@ -175,6 +186,7 @@ target_link_libraries(kdenlive
   ${LIBMLT_LIBRARY}
   ${NEPOMUK_LIBRARIES}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
+  ${KDE4_KROSSUI_LIBS}
 )
 
 if (APPLE)
@@ -184,10 +196,10 @@ 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 kdenlive_render.knsrc kdenlive_mltprofiles.knsrc DESTINATION  ${CONFIG_INSTALL_DIR} )
+install (FILES kdenlivesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR})
+install (FILES kdenlive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install (FILES application-x-kdenlive.svgz video-mlt-playlist.svgz DESTINATION ${ICON_INSTALL_DIR}/oxygen/scalable/mimetypes)
+install( FILES kdenlive.knsrc kdenlive_render.knsrc kdenlive_mltprofiles.knsrc kdenlivetranscodingrc DESTINATION  ${CONFIG_INSTALL_DIR} )
 kde4_install_icons( ${ICON_INSTALL_DIR} )