X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=db49e9a61c466a95fd1c11c45cbee1472ed180d9;hb=5cce47dd2e237bd77f1c9d0c00d775d230e25d24;hp=f2ef96c2c8e8c9fe00750dc38bb83465bbb4de6f;hpb=bea187213f3356420e9385401ccda1c3cfb454ec;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f2ef96c2..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,20 +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/titlewidget_ui.ui
   widgets/unicodedialog_ui.ui
   widgets/timelinebuttons_ui.ui
@@ -92,6 +95,9 @@ kde4_add_ui_files(kdenlive_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
@@ -193,13 +199,29 @@ set(kdenlive_SRCS
   timecodedisplay.cpp
   tracksconfigdialog.cpp
   configtrackscommand.cpp
+  abstractscopewidget.cpp
+  rebuildgroupcommand.cpp
+  histogram.cpp
+  rgbparade.cpp
   vectorscope.cpp
+  waveform.cpp
   colorplaneexport.cpp
   colortools.cpp
-  rebuildgroupcommand.cpp
-  waveform.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)
@@ -233,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})