Const'ref

[kdenlive] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f69796e3ee565294a5c23650f632aa414596e0b5..3e616d30207d80c297b79523cad057a36233d26f 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,15 +13,17 @@ 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
   # 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)
@@ -31,10 +33,6 @@ 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"
@@ -68,6 +66,10 @@ macro_log_feature(Nepomuk_FOUND
   "http://nepomuk.semanticdesktop.org"
 )
 
+find_package(NepomukCore QUIET)
+set_package_properties(NepomukCore PROPERTIES DESCRIPTION "The Nepomuk Core libraries" URL "http://www.kde.org" TYPE RECOMMENDED PURPOSE "Support for the Nepomuk semantic desktop system")
+
+
 macro_log_feature(QJSON_FOUND
   "QJson"
   "Qt-based library that maps JSON data to QVariant objects"
@@ -78,19 +80,17 @@ macro_log_feature(QJSON_FOUND
 )
 
 
-add_subdirectory(audioscopes)
 add_subdirectory(beziercurve)
 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(effectstack)
 add_subdirectory(mimetypes)
 add_subdirectory(onmonitoritems)
+add_subdirectory(scopes)
 add_subdirectory(simplekeyframes)
 add_subdirectory(stopmotion)
 
@@ -103,10 +103,6 @@ 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
@@ -115,9 +111,7 @@ list(APPEND kdenlive_SRCS
   abstractclipitem.cpp
   abstractgroupitem.cpp
   abstractmonitor.cpp
-  abstractscopewidget.cpp
   archivewidget.cpp
-  audiosignal.cpp
   choosecolorwidget.cpp
   clipdurationdialog.cpp
   clipitem.cpp
@@ -133,6 +127,7 @@ list(APPEND kdenlive_SRCS
   customruler.cpp
   customtrackscene.cpp
   customtrackview.cpp
+  definitions.cpp
   docclipbase.cpp
   documentchecker.cpp
   documentvalidator.cpp
@@ -146,7 +141,6 @@ list(APPEND kdenlive_SRCS
   effectslistview.cpp
   effectslistwidget.cpp
   effectstackedit.cpp
-  effectstackview.cpp
   encodingprofilesdialog.cpp
   folderprojectitem.cpp
   gentime.cpp
@@ -209,6 +203,7 @@ 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
@@ -226,6 +221,7 @@ 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
@@ -257,7 +253,7 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/trackheader_ui.ui
   widgets/tracksconfigdialog_ui.ui
   widgets/transitionsettings_ui.ui
-  widgets/unicodedialog_ui.ui
+  widgets/unicodewidget_ui.ui
   widgets/urlval_ui.ui
   widgets/vectorscope_ui.ui
   widgets/waveform_ui.ui
@@ -270,6 +266,8 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/keywordval_ui.ui
   widgets/fontval_ui.ui
   widgets/cutjobdialog_ui.ui
+  widgets/scenecutdialog_ui.ui
+  widgets/importkeyframesdialog_ui.ui
 )
 
 if(OPENGL_FOUND)
@@ -311,6 +309,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})
@@ -349,11 +348,17 @@ if(SDL_FOUND)
   target_link_libraries(kdenlive ${SDL_LIBRARY})
 endif(SDL_FOUND)
 
-if(Nepomuk_FOUND)
-  add_definitions(-DUSE_NEPOMUK)
-  include_directories(${NEPOMUK_INCLUDES})
-  target_link_libraries(kdenlive ${NEPOMUK_LIBRARIES})
-endif(Nepomuk_FOUND)
+if(NepomukCore_FOUND)
+    add_definitions(-DUSE_NEPOMUKCORE)
+    include_directories(${NEPOMUK_CORE_INCLUDE_DIR})
+    target_link_libraries(kdenlive ${NEPOMUK_CORE_LIBRARY})
+else(NepomukWidgets_FOUND)
+  if(Nepomuk_FOUND)
+    add_definitions(-DUSE_NEPOMUK)
+    include_directories(${NEPOMUK_INCLUDES})
+    target_link_libraries(kdenlive ${NEPOMUK_LIBRARIES})
+  endif(Nepomuk_FOUND)
+endif()
 
 if(QJSON_FOUND)
   add_definitions(-DUSE_QJSON)
@@ -362,13 +367,11 @@ 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)
 
-if(BUILD_BlackMagic)
-  add_definitions(-DUSE_BLACKMAGIC)
-endif(BUILD_BlackMagic)
-
 if(BUILD_JogShuttle)
   add_definitions(-DUSE_JOGSHUTTLE)
 endif(BUILD_JogShuttle)