X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=db49e9a61c466a95fd1c11c45cbee1472ed180d9;hb=7faa196f9b4a7c03dd2442439500efed29e6c53b;hp=a2c97a229acdb8accb61f4102445dc402633bdf3;hpb=b73a3b2ffe141e5413e583091b355d8eb752aeb9;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a2c97a22..db49e9a6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,6 +9,9 @@ if (Nepomuk_FOUND)
     add_definitions(-DNEPOMUK)
 endif (Nepomuk_FOUND)
 
+if (Q_WS_X11)
+    include_directories (${X11_Xlib_INCLUDE_PATH} ) 
+endif (Q_WS_X11)
 
 if (APPLE)
   find_package(OpenGL)
@@ -26,6 +29,7 @@ include_directories (
     ${CMAKE_BINARY_DIR}
 
     ${CMAKE_SOURCE_DIR}/src/widgets
+    ${CMAKE_SOURCE_DIR}/src/colorcorrection
 )
 
 LINK_LIBRARIES(
@@ -44,21 +48,19 @@ kde4_add_ui_files(kdenlive_UI
   widgets/slideshowclip_ui.ui
   widgets/configmisc_ui.ui
   widgets/configenv_ui.ui
-  widgets/configdisplay_ui.ui
+  widgets/configtimeline_ui.ui
   widgets/configsdl_ui.ui
   widgets/configcapture_ui.ui
   widgets/configtranscode_ui.ui
+  widgets/configproject_ui.ui
   widgets/effectlist_ui.ui
   widgets/effectstack_ui.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
-  widgets/colorval_ui.ui
-  widgets/positionval_ui.ui
   widgets/titlewidget_ui.ui
   widgets/unicodedialog_ui.ui
   widgets/timelinebuttons_ui.ui
@@ -85,9 +87,17 @@ kde4_add_ui_files(kdenlive_UI
   widgets/dvdwizardchapters_ui.ui
   widgets/missingclips_ui.ui
   widgets/cliptranscode_ui.ui
-  widgets/geometryposition_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
+  widgets/colorplaneexport_ui.ui
+  widgets/waveform_ui.ui
+  widgets/rgbparade_ui.ui
+  widgets/histogram_ui.ui
+  widgets/geometrywidget_ui.ui
 )
 
 set(kdenlive_SRCS
@@ -164,7 +174,6 @@ set(kdenlive_SRCS
   insertspacecommand.cpp
   spacerdialog.cpp
   addtrackcommand.cpp
-  changetrackcommand.cpp
   movegroupcommand.cpp
   dvdwizardvob.cpp
   dvdwizardmenu.cpp
@@ -187,8 +196,32 @@ set(kdenlive_SRCS
   KoSliderCombo.cpp
   kis_cubic_curve.cpp
   kis_curve_widget.cpp
+  timecodedisplay.cpp
+  tracksconfigdialog.cpp
+  configtrackscommand.cpp
+  abstractscopewidget.cpp
+  rebuildgroupcommand.cpp
+  histogram.cpp
+  rgbparade.cpp
+  vectorscope.cpp
+  waveform.cpp
+  colorplaneexport.cpp
+  colortools.cpp
+  colorcorrection/histogramgenerator.cpp
+  colorcorrection/rgbparadegenerator.cpp
+  colorcorrection/vectorscopegenerator.cpp
+  colorcorrection/waveformgenerator.cpp
+  razorgroupcommand.cpp
+  colorpickerwidget.cpp
+  choosecolorwidget.cpp
+  monitorscene.cpp
+  geometrywidget.cpp
+  doubleparameterwidget.cpp
 )
 
+
+add_subdirectory( ${CMAKE_SOURCE_DIR}/src/colorcorrection )
+
 add_definitions( ${KDE4_DEFINITIONS} )
 
 if(NO_JOGSHUTTLE)
@@ -222,6 +255,10 @@ target_link_libraries(kdenlive
   ${KDE4_KROSSUI_LIBS}
 )
 
+if (Q_WS_X11)
+  target_link_libraries(kdenlive ${X11_LIBRARIES})
+endif (Q_WS_X11)
+
 if (APPLE)
   find_package(SDL REQUIRED)
   target_link_libraries(kdenlive ${SDL_LIBRARY})