Fix wrong group moving when groups overlap

[kdenlive] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0dd66b43fabd2912af015309bea4de919d8d9e83..0aef0bbb95b85cc12cc881df613220f2aae84afe 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)
@@ -9,13 +14,16 @@ macro_optional_find_package(QJSON)
 option(WITH_V4L "Build capture support with Video4Linux" ON)
 option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
 
+
+
 if(WITH_V4L)
   # This can be changed to support FreeBSD as soon as we move to a newer V4L2
   # header.
-  check_include_files(linux/ioctl.h HAVE_LINUX_IOCTL_H)
-  if(HAVE_LINUX_IOCTL_H)
+  find_package(LibV4L2)
+  macro_log_feature(LIBV4L2_FOUND "libv4l" "Collection of video4linux support libraries" "http://hansdegoede.livejournal.com, http://linuxtv.org/hg/~hgoede/libv4l/" FALSE "" "Required for better webcam support")
+  if(LIBV4L2_FOUND)
     set(BUILD_V4L TRUE)
-  endif(HAVE_LINUX_IOCTL_H)
+  endif(LIBV4L2_FOUND)
 endif(WITH_V4L)
 
 if(WITH_JogShuttle)
@@ -64,19 +72,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(effectstack)
 add_subdirectory(mimetypes)
 add_subdirectory(onmonitoritems)
+add_subdirectory(scopes)
 add_subdirectory(simplekeyframes)
 add_subdirectory(stopmotion)
 
@@ -97,15 +107,14 @@ list(APPEND kdenlive_SRCS
   abstractclipitem.cpp
   abstractgroupitem.cpp
   abstractmonitor.cpp
-  abstractscopewidget.cpp
   archivewidget.cpp
-  audiosignal.cpp
   choosecolorwidget.cpp
   clipdurationdialog.cpp
   clipitem.cpp
   clipmanager.cpp
   clipproperties.cpp
   cliptranscode.cpp
+  clipstabilize.cpp
   colorpickerwidget.cpp
   colorplaneexport.cpp
   colortools.cpp
@@ -114,6 +123,7 @@ list(APPEND kdenlive_SRCS
   customruler.cpp
   customtrackscene.cpp
   customtrackview.cpp
+  definitions.cpp
   docclipbase.cpp
   documentchecker.cpp
   documentvalidator.cpp
@@ -127,7 +137,6 @@ list(APPEND kdenlive_SRCS
   effectslistview.cpp
   effectslistwidget.cpp
   effectstackedit.cpp
-  effectstackview.cpp
   encodingprofilesdialog.cpp
   folderprojectitem.cpp
   gentime.cpp
@@ -190,6 +199,8 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/clipdurationdialog_ui.ui
   widgets/clipproperties_ui.ui
   widgets/cliptranscode_ui.ui
+  widgets/collapsiblewidget_ui.ui
+  widgets/clipstabilize_ui.ui
   widgets/colorclip_ui.ui
   widgets/colorplaneexport_ui.ui
   widgets/configcapture_ui.ui
@@ -206,6 +217,8 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/dvdwizardvob_ui.ui
   widgets/effectlist_ui.ui
   widgets/effectstack_ui.ui
+  widgets/effectstack2_ui.ui
+  widgets/freesound_ui.ui
   widgets/geometryval_ui.ui
   widgets/geometrywidget_ui.ui
   widgets/histogram_ui.ui
@@ -246,6 +259,11 @@ 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
+  widgets/scenecutdialog_ui.ui
+  widgets/importkeyframesdialog_ui.ui
 )
 
 if(OPENGL_FOUND)
@@ -287,6 +305,7 @@ include_directories(
   ${LIBMLTPLUS_INCLUDE_DIR}
 )
 
+
 # Adds Qt definitions and include directories, and sets QT_LIBRARIES according
 # to the components requested in find_package().
 include(${QT_USE_FILE})
@@ -303,6 +322,7 @@ target_link_libraries(kdenlive
   ${KDE4_KNEWSTUFF_LIBS}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
   ${KDE4_KROSSUI_LIBS}
+  ${KDE4_SOLID_LIBS}
   ${QT_LIBRARIES}
   ${LIBMLT_LIBRARY}
   ${LIBMLTPLUS_LIBRARY}
@@ -337,6 +357,8 @@ if(QJSON_FOUND)
 endif(QJSON_FOUND)
 
 if(BUILD_V4L)
+  include_directories(${LIBV4L2_INCLUDE_DIR})
+  target_link_libraries(kdenlive ${LIBV4L2_LIBRARY})  
   add_definitions(-DUSE_V4L)
 endif(BUILD_V4L)