X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=c784aafcc3dc15edca7bddd6f99954387b9a378c;hb=8be6c85ffd189c228938a982d0d6a5f97650481a;hp=73983ce94f0677fc909772b1d04774a668e81af6;hpb=4990696d5459af62020d1bb306551c96935a3830;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73983ce9..c784aafc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -66,7 +66,7 @@ macro_log_feature(Nepomuk_FOUND
   "http://nepomuk.semanticdesktop.org"
 )
 
-find_package(NepomukCore QUIET CONFIG)
+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")
 
 
@@ -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)
@@ -194,80 +195,80 @@ 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)
@@ -288,7 +289,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}
@@ -391,5 +392,5 @@ install(FILES
   kdenlivetranscodingrc
   DESTINATION ${CONFIG_INSTALL_DIR}
 )
-kde4_install_icons(${ICON_INSTALL_DIR})
+add_subdirectory(icons)
 install(FILES kdenlive.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})