X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=4664e1c9b1098f8427f849354952d6d311b69941;hb=fc7b1b8dcdedceac156f8f3068fe04909bc9d007;hp=25dd4ed4fe689ee30a891ea146f3ef9581034e10;hpb=81be3bf632b306ffd8795f0c81d4372e358e88d2;p=kdenlive diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 25dd4ed4..4664e1c9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -3,10 +3,12 @@ add_subdirectory(colorcorrection) add_subdirectory(kiss_fft) add_subdirectory(mimetypes) add_subdirectory(onmonitoritems) +add_subdirectory(rotoscoping) add_subdirectory(widgets) +add_subdirectory(databackup) macro_optional_find_package(Nepomuk) -include(FindQImageBlitz) +macro_optional_find_package(QJSON) include_directories( ${KDE4_INCLUDE_DIR} @@ -22,6 +24,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/colorcorrection ${CMAKE_SOURCE_DIR}/src/kiss_fft ${CMAKE_SOURCE_DIR}/src/onmonitoritems + ${CMAKE_SOURCE_DIR}/src/onmonitoritems/rotoscoping ${CMAKE_SOURCE_DIR}/src/widgets ) @@ -32,14 +35,13 @@ 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(QJSON_FOUND) + include_directories(QJSON_INCLUDE_DIR) + set(optional_libs ${optional_libs} ${QJSON_LIBRARIES}) + add_definitions(-DQJSON) +else(QJSON_FOUND) + message(STATUS "Install QJson to use the rotoscoping filter") +endif(QJSON_FOUND) if(Q_WS_X11) include_directories(${X11_Xlib_INCLUDE_PATH}) @@ -108,7 +110,6 @@ kde4_add_ui_files(kdenlive_UI widgets/cliptranscode_ui.ui widgets/templateclip_ui.ui widgets/keyframeeditor_ui.ui - widgets/timecodedisplay_ui.ui widgets/tracksconfigdialog_ui.ui widgets/urlval_ui.ui widgets/vectorscope_ui.ui @@ -123,6 +124,9 @@ kde4_add_ui_files(kdenlive_UI widgets/smconfig_ui.ui widgets/bezierspline_ui.ui widgets/monitoreditwidget_ui.ui + widgets/archivewidget_ui.ui + widgets/manageencodingprofile_ui.ui + widgets/backupdialog_ui.ui ) set(kdenlive_SRCS @@ -251,8 +255,6 @@ set(kdenlive_SRCS audiosignal.cpp blackmagic/include/DeckLinkAPIDispatch.cpp stopmotion/stopmotion.cpp - stopmotion/capturehandler.cpp - blackmagic/capture.cpp blackmagic/devices.cpp onmonitoritems/onmonitorrectitem.cpp onmonitoritems/onmonitorcornersitem.cpp @@ -266,35 +268,49 @@ set(kdenlive_SRCS beziercurve/cubicbezierspline.cpp dragvalue.cpp monitoreditwidget.cpp + simplekeyframes/simpletimelinewidget.cpp + simplekeyframes/simplekeyframewidget.cpp + noteswidget.cpp + archivewidget.cpp + mltdevicecapture.cpp + abstractmonitor.cpp + encodingprofilesdialog.cpp ) add_definitions(${KDE4_DEFINITIONS}) -if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE) +if(CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") + add_definitions(-DQ_OS_KFREEBSD) +endif(CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") + +if(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD" OR NO_JOGSHUTTLE) add_definitions(-DNO_JOGSHUTTLE) -else(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE) +else(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD" OR NO_JOGSHUTTLE) set(kdenlive_SRCS jogshuttle.cpp jogaction.cpp jogshuttleconfig.cpp ${kdenlive_SRCS}) -endif(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR NO_JOGSHUTTLE) +endif(APPLE OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "NetBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD" OR NO_JOGSHUTTLE) if(APPLE OR OPENGL_FOUND) add_definitions(-DUSE_OPEN_GL) set(kdenlive_SRCS videoglwidget.cpp ${kdenlive_SRCS}) endif(APPLE OR OPENGL_FOUND) -if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +if(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") set(kdenlive_SRCS ${kdenlive_SRCS} v4l/v4lcapture.cpp v4l/src.c - v4l/src_v4l2.c - v4l/dec_bayer.c - v4l/dec_grey.c - v4l/dec_jpeg.c - v4l/dec_rgb.c - v4l/dec_s561.c - v4l/dec_yuv.c ) -endif(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") +endif(NOT APPLE AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "GNU/kFreeBSD") + +if(QJSON_FOUND) + set(kdenlive_SRCS + ${kdenlive_SRCS} + onmonitoritems/rotoscoping/bpointitem.cpp + onmonitoritems/rotoscoping/nearestpoint.cpp + onmonitoritems/rotoscoping/splineitem.cpp + rotoscoping/rotowidget.cpp + ) +endif(QJSON_FOUND) # Add libdl find_library(DL_LIB NAMES ${CMAKE_DL_LIBS}) @@ -321,6 +337,7 @@ target_link_libraries(kdenlive ${KDE4_KROSSUI_LIBS} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} + ${QT_QTSCRIPT_LIBRARY} ) if(Q_WS_X11) @@ -346,4 +363,3 @@ install(FILES kdenlivesettings.kcfg DESTINATION ${KCFG_INSTALL_DIR}) install(FILES kdenlive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR}) kde4_install_icons(${ICON_INSTALL_DIR}) install(FILES kdenlive_titles.knsrc kdenlive_wipes.knsrc kdenlive_renderprofiles.knsrc kdenlive_projectprofiles.knsrc kdenlivetranscodingrc DESTINATION ${CONFIG_INSTALL_DIR}) -kde4_install_icons(${ICON_INSTALL_DIR}) \ No newline at end of file