Merge branch 'master' into audioAlign

[kdenlive] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0dd66b43fabd2912af015309bea4de919d8d9e83..d26352fca094c8ac30c6724102951272f0be43b6 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,5 +1,10 @@
+set(QT_USE_QTDBUS 1)
+set(QT_USE_QTOPENGL 1)
+set(QT_USE_QTSCRIPT 1)
+set(QT_USE_QTSVG 1)
+set(QT_USE_QTXML 1)
+
 find_package(OpenGL REQUIRED)
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtGui QtOpenGL QtScript QtSvg QtXml)
 if(APPLE)
   find_package(SDL REQUIRED)
 endif(APPLE)
@@ -8,6 +13,7 @@ macro_optional_find_package(QJSON)
 
 option(WITH_V4L "Build capture support with Video4Linux" ON)
 option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
+option(WITH_BlackMagic "Build Blackmagic Decklinkl support" ON)
 
 if(WITH_V4L)
   # This can be changed to support FreeBSD as soon as we move to a newer V4L2
@@ -25,6 +31,10 @@ if(WITH_JogShuttle)
   endif(HAVE_LINUX_INPUT_H)
 endif(WITH_JogShuttle)
 
+if(WITH_BlackMagic)
+    set(BUILD_BlackMagic TRUE)
+endif(WITH_BlackMagic)
+
 macro_log_feature(QT_QTOPENGL_FOUND
   "QtOpenGL"
   "Qt bindings for the OpenGL library"
@@ -64,17 +74,21 @@ macro_log_feature(QJSON_FOUND
   "http://qjson.sourceforge.net"
   FALSE
   ""
-  "Required to build the rotoscoping filter"
+  "Required to build the rotoscoping filter and for Freesound.org queries"
 )
 
+
 add_subdirectory(audioscopes)
 add_subdirectory(beziercurve)
-add_subdirectory(blackmagic)
 add_subdirectory(colorcorrection)
 add_subdirectory(colorscopes)
 add_subdirectory(commands)
+add_subdirectory(lib)
+add_subdirectory(projecttree)
+add_subdirectory(utils)
 add_subdirectory(databackup)
 add_subdirectory(kiss_fft)
+add_subdirectory(lib)
 add_subdirectory(mimetypes)
 add_subdirectory(onmonitoritems)
 add_subdirectory(simplekeyframes)
@@ -89,6 +103,10 @@ if(BUILD_V4L)
   add_subdirectory(v4l)
 endif(BUILD_V4L)
 
+if(BUILD_BlackMagic)
+  add_subdirectory(blackmagic)
+endif(BUILD_BlackMagic)
+
 list(APPEND kdenlive_SRCS
   main.cpp
   mainwindow.cpp
@@ -106,6 +124,7 @@ list(APPEND kdenlive_SRCS
   clipmanager.cpp
   clipproperties.cpp
   cliptranscode.cpp
+  clipstabilize.cpp
   colorpickerwidget.cpp
   colorplaneexport.cpp
   colortools.cpp
@@ -114,6 +133,7 @@ list(APPEND kdenlive_SRCS
   customruler.cpp
   customtrackscene.cpp
   customtrackview.cpp
+  definitions.cpp
   docclipbase.cpp
   documentchecker.cpp
   documentvalidator.cpp
@@ -190,6 +210,7 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/clipdurationdialog_ui.ui
   widgets/clipproperties_ui.ui
   widgets/cliptranscode_ui.ui
+  widgets/clipstabilize_ui.ui
   widgets/colorclip_ui.ui
   widgets/colorplaneexport_ui.ui
   widgets/configcapture_ui.ui
@@ -206,6 +227,7 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/dvdwizardvob_ui.ui
   widgets/effectlist_ui.ui
   widgets/effectstack_ui.ui
+  widgets/freesound_ui.ui
   widgets/geometryval_ui.ui
   widgets/geometrywidget_ui.ui
   widgets/histogram_ui.ui
@@ -246,6 +268,9 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/wizardextra_ui.ui
   widgets/wizardmltcheck_ui.ui
   widgets/wizardstandard_ui.ui
+  widgets/keywordval_ui.ui
+  widgets/fontval_ui.ui
+  widgets/cutjobdialog_ui.ui
 )
 
 if(OPENGL_FOUND)
@@ -303,6 +328,7 @@ target_link_libraries(kdenlive
   ${KDE4_KNEWSTUFF_LIBS}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
   ${KDE4_KROSSUI_LIBS}
+  ${KDE4_SOLID_LIBS}
   ${QT_LIBRARIES}
   ${LIBMLT_LIBRARY}
   ${LIBMLTPLUS_LIBRARY}
@@ -340,6 +366,10 @@ if(BUILD_V4L)
   add_definitions(-DUSE_V4L)
 endif(BUILD_V4L)
 
+if(BUILD_BlackMagic)
+  add_definitions(-DUSE_BLACKMAGIC)
+endif(BUILD_BlackMagic)
+
 if(BUILD_JogShuttle)
   add_definitions(-DUSE_JOGSHUTTLE)
 endif(BUILD_JogShuttle)