X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=19e34508d20fb88ba1a31c70ecc4079d04a08d02;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=5555746df71148e6853ee7db0c05d865657bf75f;hpb=a3cec798a7c47d92dfbea960661b3bfe6b68c94d;p=kdenlive diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5555746d..19e34508 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,6 +93,7 @@ add_subdirectory(onmonitoritems) add_subdirectory(scopes) add_subdirectory(simplekeyframes) add_subdirectory(stopmotion) +add_subdirectory(widgets) if(QJSON_FOUND) add_subdirectory(onmonitoritems/rotoscoping) @@ -110,20 +111,15 @@ list(APPEND kdenlive_SRCS KoSliderCombo.cpp abstractclipitem.cpp abstractgroupitem.cpp - abstractmonitor.cpp - archivewidget.cpp - choosecolorwidget.cpp clipdurationdialog.cpp clipitem.cpp clipmanager.cpp clipproperties.cpp cliptranscode.cpp clipstabilize.cpp - colorpickerwidget.cpp colorplaneexport.cpp colortools.cpp complexparameter.cpp - cornerswidget.cpp customruler.cpp customtrackscene.cpp customtrackview.cpp @@ -131,7 +127,6 @@ list(APPEND kdenlive_SRCS docclipbase.cpp documentchecker.cpp documentvalidator.cpp - doubleparameterwidget.cpp dragvalue.cpp dvdwizard.cpp dvdwizardchapters.cpp @@ -139,13 +134,11 @@ list(APPEND kdenlive_SRCS dvdwizardvob.cpp effectslist.cpp effectslistview.cpp - effectslistwidget.cpp effectstackedit.cpp encodingprofilesdialog.cpp folderprojectitem.cpp gentime.cpp geometryval.cpp - geometrywidget.cpp graphicsscenerectmove.cpp guide.cpp headertrack.cpp @@ -155,16 +148,13 @@ list(APPEND kdenlive_SRCS keyframeedit.cpp keyframehelper.cpp kis_cubic_curve.cpp - kis_curve_widget.cpp kthumb.cpp managecapturesdialog.cpp markerdialog.cpp mltdevicecapture.cpp monitor.cpp - monitoreditwidget.cpp monitormanager.cpp monitorscene.cpp - noteswidget.cpp parameterplotter.cpp positionedit.cpp profilesdialog.cpp @@ -174,7 +164,6 @@ list(APPEND kdenlive_SRCS projectsettings.cpp recmonitor.cpp renderer.cpp - renderwidget.cpp slideshowclip.cpp smallruler.cpp spacerdialog.cpp @@ -183,7 +172,6 @@ list(APPEND kdenlive_SRCS timecode.cpp timecodedisplay.cpp titledocument.cpp - titlewidget.cpp trackdialog.cpp tracksconfigdialog.cpp trackview.cpp @@ -194,86 +182,82 @@ list(APPEND kdenlive_SRCS ) kde4_add_ui_files(kdenlive_UIS - widgets/addtrack_ui.ui - widgets/archivewidget_ui.ui - widgets/audiospectrum_ui.ui - widgets/backupdialog_ui.ui - widgets/bezierspline_ui.ui - widgets/boolval_ui.ui - 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 - widgets/configenv_ui.ui - widgets/configjogshuttle_ui.ui - widgets/configmisc_ui.ui - widgets/configproject_ui.ui - widgets/configsdl_ui.ui - widgets/configtimeline_ui.ui - widgets/configtranscode_ui.ui - widgets/dvdwizardchapters_ui.ui - widgets/dvdwizardmenu_ui.ui - widgets/dvdwizardstatus_ui.ui - 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 - widgets/keyframedialog_ui.ui - widgets/keyframeeditor_ui.ui - widgets/keyframewidget_ui.ui - widgets/listval_ui.ui - widgets/managecaptures_ui.ui - widgets/manageencodingprofile_ui.ui - widgets/markerdialog_ui.ui - widgets/missingclips_ui.ui - widgets/monitoreditwidget_ui.ui - widgets/profiledialog_ui.ui - widgets/projectsettings_ui.ui - widgets/recmonitor_ui.ui - widgets/renderwidget_ui.ui - widgets/rgbparade_ui.ui - widgets/saveprofile_ui.ui - widgets/slideshowclip_ui.ui - widgets/smconfig_ui.ui - widgets/spacerdialog_ui.ui - widgets/spectrogram_ui.ui - widgets/stopmotion_ui.ui - widgets/templateclip_ui.ui - widgets/timeline_ui.ui - widgets/timelinebuttons_ui.ui - widgets/titlewidget_ui.ui - widgets/trackheader_ui.ui - widgets/tracksconfigdialog_ui.ui - widgets/transitionsettings_ui.ui - widgets/unicodewidget_ui.ui - widgets/urlval_ui.ui - widgets/vectorscope_ui.ui - widgets/waveform_ui.ui - widgets/wipeval_ui.ui - widgets/wizardcapture_ui.ui - widgets/wizardcheck_ui.ui - 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 + ui/addtrack_ui.ui + ui/archivewidget_ui.ui + ui/audiospectrum_ui.ui + ui/backupdialog_ui.ui + ui/bezierspline_ui.ui + ui/boolval_ui.ui + ui/clipdurationdialog_ui.ui + ui/clipproperties_ui.ui + ui/cliptranscode_ui.ui + ui/collapsiblewidget_ui.ui + ui/clipstabilize_ui.ui + ui/colorclip_ui.ui + ui/colorplaneexport_ui.ui + ui/configcapture_ui.ui + ui/configenv_ui.ui + ui/configjogshuttle_ui.ui + ui/configmisc_ui.ui + ui/configproject_ui.ui + ui/configsdl_ui.ui + ui/configtimeline_ui.ui + ui/configtranscode_ui.ui + ui/dvdwizardchapters_ui.ui + ui/dvdwizardmenu_ui.ui + ui/dvdwizardstatus_ui.ui + ui/dvdwizardvob_ui.ui + ui/effectlist_ui.ui + ui/effectstack_ui.ui + ui/effectstack2_ui.ui + ui/freesound_ui.ui + ui/geometryval_ui.ui + ui/geometrywidget_ui.ui + ui/histogram_ui.ui + ui/keyframedialog_ui.ui + ui/keyframeeditor_ui.ui + ui/keyframewidget_ui.ui + ui/listval_ui.ui + ui/managecaptures_ui.ui + ui/manageencodingprofile_ui.ui + ui/markerdialog_ui.ui + ui/missingclips_ui.ui + ui/monitoreditwidget_ui.ui + ui/profiledialog_ui.ui + ui/projectsettings_ui.ui + ui/recmonitor_ui.ui + ui/renderwidget_ui.ui + ui/rgbparade_ui.ui + ui/saveprofile_ui.ui + ui/slideshowclip_ui.ui + ui/smconfig_ui.ui + ui/spacerdialog_ui.ui + ui/spectrogram_ui.ui + ui/stopmotion_ui.ui + ui/templateclip_ui.ui + ui/timeline_ui.ui + ui/timelinebuttons_ui.ui + ui/titlewidget_ui.ui + ui/trackheader_ui.ui + ui/tracksconfigdialog_ui.ui + ui/transitionsettings_ui.ui + ui/unicodewidget_ui.ui + ui/urlval_ui.ui + ui/vectorscope_ui.ui + ui/waveform_ui.ui + ui/wipeval_ui.ui + ui/wizardcapture_ui.ui + ui/wizardcheck_ui.ui + ui/wizardextra_ui.ui + ui/wizardmltcheck_ui.ui + ui/wizardstandard_ui.ui + ui/keywordval_ui.ui + ui/fontval_ui.ui + ui/cutjobdialog_ui.ui + ui/scenecutdialog_ui.ui + ui/importkeyframesdialog_ui.ui ) -if(OPENGL_FOUND) - list(APPEND kdenlive_SRCS videoglwidget.cpp) -endif(OPENGL_FOUND) - if(BUILD_JogShuttle) list(APPEND kdenlive_SRCS jogaction.cpp @@ -288,7 +272,7 @@ qt4_add_dbus_adaptor(kdenlive_SRCS mainwindow.h MainWindow ) -qt4_add_resources(kdenlive_SRCS widgets/resources.qrc) +qt4_add_resources(kdenlive_SRCS ui/resources.qrc) kde4_add_executable(kdenlive ${kdenlive_SRCS} ${kdenlive_UIS} @@ -307,6 +291,8 @@ include_directories( ${KDE4_INCLUDES} # Adds Qt include directories too. ${LIBMLT_INCLUDE_DIR} ${LIBMLTPLUS_INCLUDE_DIR} + ${CMAKE_CURRENT_SOURCE_DIR}/lib/external + ${CMAKE_CURRENT_SOURCE_DIR}/lib ) @@ -332,6 +318,8 @@ target_link_libraries(kdenlive ${LIBMLTPLUS_LIBRARY} ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} + ${OPENGL_LIBRARIES} + kiss_fft ) if(Q_WS_X11) @@ -339,11 +327,6 @@ if(Q_WS_X11) target_link_libraries(kdenlive ${X11_LIBRARIES}) endif(Q_WS_X11) -if(OPENGL_FOUND AND QT_QTOPENGL_FOUND) - add_definitions(-DUSE_OPENGL) - target_link_libraries(kdenlive ${OPENGL_LIBRARIES}) -endif(OPENGL_FOUND AND QT_QTOPENGL_FOUND) - if(SDL_FOUND) target_link_libraries(kdenlive ${SDL_LIBRARY}) endif(SDL_FOUND) @@ -352,7 +335,7 @@ if(NepomukCore_FOUND) add_definitions(-DUSE_NEPOMUKCORE) include_directories(${NEPOMUK_CORE_INCLUDE_DIR}) target_link_libraries(kdenlive ${NEPOMUK_CORE_LIBRARY}) -else(NepomukWidgets_FOUND) +else() if(Nepomuk_FOUND) add_definitions(-DUSE_NEPOMUK) include_directories(${NEPOMUK_INCLUDES}) @@ -374,6 +357,9 @@ endif(BUILD_V4L) if(BUILD_JogShuttle) add_definitions(-DUSE_JOGSHUTTLE) + target_link_libraries(kdenlive + media_ctrl + ) endif(BUILD_JogShuttle) install(TARGETS kdenlive DESTINATION ${BIN_INSTALL_DIR})