X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=5d0ecb12352f7773810e63f7fe7063364a77bfdb;hb=5b46fc10606de750e8321a519294f006b6ae98a7;hp=8b41476d8ec5d71eead200382f4e7acff52a58b5;hpb=5ea297a1c4f65991ec0f53631f16dfc9efed6a4b;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8b41476d..5d0ecb12 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -2,6 +2,7 @@ add_subdirectory( widgets )
 add_subdirectory( mimetypes )
 
 macro_optional_find_package(Nepomuk)
+include(FindQImageBlitz)
 
 if (Nepomuk_FOUND)
     INCLUDE_DIRECTORIES(NEPOMUK_INCLUDES )
@@ -9,6 +10,15 @@ if (Nepomuk_FOUND)
     add_definitions(-DNEPOMUK)
 endif (Nepomuk_FOUND)
 
+if (QIMAGEBLITZ_FOUND)
+    INCLUDE_DIRECTORIES(QIMAGEBLITZ_INCLUDES )
+    set( optional_libs ${optional_libs} ${QIMAGEBLITZ_LIBRARIES} )
+    add_definitions(-DQIMAGEBLITZ)
+    MESSAGE( STATUS "Found QImageBlitz: ${QIMAGEBLITZ_LIBRARIES}" )
+else (QIMAGEBLITZ_FOUND)
+    MESSAGE( STATUS "Install QImageBlitz devel package for improved stopmotion features" )
+endif (QIMAGEBLITZ_FOUND)
+
 if (Q_WS_X11)
     include_directories (${X11_Xlib_INCLUDE_PATH} ) 
 endif (Q_WS_X11)
@@ -16,6 +26,8 @@ endif (Q_WS_X11)
 if (APPLE)
   find_package(OpenGL)
   set(QT_USE_QTOPENGL TRUE)
+else (APPLE)
+  macro_optional_find_package(OpenGL)
 endif (APPLE)
 
 include_directories (
@@ -30,6 +42,7 @@ include_directories (
 
     ${CMAKE_SOURCE_DIR}/src/widgets
     ${CMAKE_SOURCE_DIR}/src/colorcorrection
+    ${CMAKE_SOURCE_DIR}/src/onmonitoritems
 )
 
 LINK_LIBRARIES(
@@ -42,7 +55,6 @@ ${optional_libs}
 
 kde4_add_ui_files(kdenlive_UI
   widgets/timeline_ui.ui
-  widgets/monitor_ui.ui
   widgets/recmonitor_ui.ui
   widgets/colorclip_ui.ui
   widgets/slideshowclip_ui.ui
@@ -58,7 +70,6 @@ kde4_add_ui_files(kdenlive_UI
   widgets/profiledialog_ui.ui
   widgets/projectsettings_ui.ui
   widgets/keyframewidget_ui.ui
-  widgets/constval_ui.ui
   widgets/listval_ui.ui
   widgets/wipeval_ui.ui
   widgets/boolval_ui.ui
@@ -99,6 +110,9 @@ kde4_add_ui_files(kdenlive_UI
   widgets/rgbparade_ui.ui
   widgets/histogram_ui.ui
   widgets/geometrywidget_ui.ui
+  widgets/stopmotion_ui.ui
+  widgets/monitorscenecontrolwidget_ui.ui
+  widgets/cornerswidget_ui.ui
 )
 
 set(kdenlive_SRCS
@@ -217,22 +231,44 @@ set(kdenlive_SRCS
   choosecolorwidget.cpp
   monitorscene.cpp
   geometrywidget.cpp
+  doubleparameterwidget.cpp
+  audiosignal.cpp
+  blackmagic/include/DeckLinkAPIDispatch.cpp
+  stopmotion/stopmotion.cpp
+  stopmotion/capturehandler.cpp
+  blackmagic/capture.cpp
+  blackmagic/devices.cpp
+  v4l/v4lcapture.cpp
+  v4l/src.c
+  v4l/src_v4l2.c
+  onmonitoritems/abstractonmonitoritem.cpp 
+  onmonitoritems/onmonitorrectitem.cpp
+  onmonitoritems/onmonitorcornersitem.cpp
+  monitorscenecontrolwidget.cpp
+  cornerswidget.cpp
 )
 
 
 add_subdirectory( ${CMAKE_SOURCE_DIR}/src/colorcorrection )
+add_subdirectory( ${CMAKE_SOURCE_DIR}/src/onmonitoritems )
 
 add_definitions( ${KDE4_DEFINITIONS} )
 
-if(NO_JOGSHUTTLE)
+if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE)
   add_definitions(-DNO_JOGSHUTTLE)
-else(NO_JOGSHUTTLE)
+else(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE)
   set(kdenlive_SRCS jogshuttle.cpp ${kdenlive_SRCS})
-endif(NO_JOGSHUTTLE)
+endif(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE)
 
-if (APPLE)
+if (APPLE OR OPENGL_FOUND)
+  add_definitions(-DUSE_OPEN_GL)
   set(kdenlive_SRCS videoglwidget.cpp ${kdenlive_SRCS})
-endif (APPLE)
+endif (APPLE OR OPENGL_FOUND)
+
+
+# Add libdl
+find_library( DL_LIB NAMES ${CMAKE_DL_LIBS} )
+MESSAGE( STATUS "using dl library: ${DL_LIB}" )
 
 kde4_add_kcfg_files(kdenlive_SRCS kdenlivesettings.kcfgc )
 QT4_ADD_DBUS_ADAPTOR(kdenlive_SRCS org.kdenlive.MainWindow.xml mainwindow.h MainWindow)
@@ -253,6 +289,7 @@ target_link_libraries(kdenlive
   ${optional_libs}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
   ${KDE4_KROSSUI_LIBS}
+  ${CMAKE_DL_LIBS}
 )
 
 if (Q_WS_X11)
@@ -264,6 +301,12 @@ if (APPLE)
   target_link_libraries(kdenlive ${SDL_LIBRARY})
   target_link_libraries(kdenlive ${QT_QTOPENGL_LIBRARY})
   target_link_libraries(kdenlive ${OPENGL_LIBRARIES})
+else (APPLE)
+  add_definitions(-DHAVE_V4L2)
+  if (OPENGL_FOUND)
+      target_link_libraries(kdenlive ${QT_QTOPENGL_LIBRARY})
+      target_link_libraries(kdenlive ${OPENGL_LIBRARIES})
+  endif (OPENGL_FOUND)
 endif (APPLE)
 
 install(TARGETS kdenlive DESTINATION ${BIN_INSTALL_DIR})