X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=e5c951802f7d19abf8eb82d8acc9fb2b02bbfeb5;hb=ae4435f6e34b423b256b38d3f480d1893650ef78;hp=a0ecc3e2771fbe64444ff005a1a4126ac190e5e5;hpb=880efc8572a7df65453dfb5736de6455fe129a86;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a0ecc3e2..e5c95180 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,14 @@
 add_subdirectory( widgets )
 add_subdirectory( mimetypes )
 
-find_package(Nepomuk REQUIRED)
+macro_optional_find_package(Nepomuk)
+
+if (Nepomuk_FOUND)
+    INCLUDE_DIRECTORIES(NEPOMUK_INCLUDES )
+    set( optional_libs ${NEPOMUK_LIBRARIES} )
+    add_definitions(-DNEPOMUK)
+endif (Nepomuk_FOUND)
+
 
 if (APPLE)
   find_package(OpenGL)
@@ -19,16 +26,17 @@ include_directories (
     ${CMAKE_BINARY_DIR}
 
     ${CMAKE_SOURCE_DIR}/src/widgets
-    ${NEPOMUK_INCLUDES}
+    ${CMAKE_SOURCE_DIR}/src/colorcorrection
 )
 
 LINK_LIBRARIES(
 ${LIBMLT_LIBRARY}
 ${LIBMLTPLUS_LIBRARY}
-${NEPOMUK_LIBRARIES}
+${optional_libs}
 )
 
 
+
 kde4_add_ui_files(kdenlive_UI
   widgets/timeline_ui.ui
   widgets/monitor_ui.ui
@@ -51,7 +59,6 @@ kde4_add_ui_files(kdenlive_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
@@ -78,9 +85,14 @@ 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
 )
 
 set(kdenlive_SRCS
@@ -157,7 +169,6 @@ set(kdenlive_SRCS
   insertspacecommand.cpp
   spacerdialog.cpp
   addtrackcommand.cpp
-  changetrackcommand.cpp
   movegroupcommand.cpp
   dvdwizardvob.cpp
   dvdwizardmenu.cpp
@@ -174,9 +185,26 @@ set(kdenlive_SRCS
   positionedit.cpp
   trackdialog.cpp
   subprojectitem.cpp
+  folderprojectitem.cpp
   addclipcutcommand.cpp
+  editclipcutcommand.cpp
+  KoSliderCombo.cpp
+  kis_cubic_curve.cpp
+  kis_curve_widget.cpp
+  timecodedisplay.cpp
+  tracksconfigdialog.cpp
+  configtrackscommand.cpp
+  vectorscope.cpp
+  colorplaneexport.cpp
+  colortools.cpp
+  rebuildgroupcommand.cpp
+  waveform.cpp
+  colorcorrection/waveformgenerator.cpp
 )
 
+
+add_subdirectory( ${CMAKE_SOURCE_DIR}/src/colorcorrection )
+
 add_definitions( ${KDE4_DEFINITIONS} )
 
 if(NO_JOGSHUTTLE)
@@ -193,14 +221,19 @@ kde4_add_kcfg_files(kdenlive_SRCS kdenlivesettings.kcfgc )
 QT4_ADD_DBUS_ADAPTOR(kdenlive_SRCS org.kdenlive.MainWindow.xml mainwindow.h MainWindow)
 kde4_add_executable(kdenlive ${kdenlive_SRCS} ${kdenlive_UI})
 
+if (${KDE_VERSION} VERSION_LESS 4.3.80)
+  set(KNEWSTUFF_LIBS ${KDE4_KNEWSTUFF2_LIBS})
+else (${KDE_VERSION} VERSION_LESS 4.3.80)
+  set(KNEWSTUFF_LIBS ${KDE4_KNEWSTUFF3_LIBS})
+endif (${KDE_VERSION} VERSION_LESS 4.3.80)
 
 target_link_libraries(kdenlive
   ${KDE4_KDEUI_LIBS}
   ${KDE4_KIO_LIBS}
-  ${KDE4_KNEWSTUFF2_LIBS}
+  ${KNEWSTUFF_LIBS}
   ${LIBMLTPLUS_LIBRARY}
   ${LIBMLT_LIBRARY}
-  ${NEPOMUK_LIBRARIES}
+  ${optional_libs}
   ${KDE4_KNOTIFYCONFIG_LIBRARY}
   ${KDE4_KROSSUI_LIBS}
 )
@@ -217,7 +250,7 @@ install( FILES kdenliveui.rc kdenlive.notifyrc DESTINATION  ${DATA_INSTALL_DIR}/
 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.knsrc kdenlive_render.knsrc kdenlive_mltprofiles.knsrc kdenlivetranscodingrc DESTINATION  ${CONFIG_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} )