minor code style fixes

[kdenlive] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7caa091b1dc93c0636535989786172c6d84676b2..1ee4b651032330688926f7c5cbb2a064f803d38b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -111,7 +111,6 @@ list(APPEND kdenlive_SRCS
   KoSliderCombo.cpp
   abstractclipitem.cpp
   abstractgroupitem.cpp
-  abstractmonitor.cpp
   clipdurationdialog.cpp
   clipitem.cpp
   clipmanager.cpp
@@ -260,7 +259,7 @@ kde4_add_ui_files(kdenlive_UIS
 )
 
 if(OPENGL_FOUND)
-  list(APPEND kdenlive_SRCS videoglwidget.cpp)
+  list(APPEND kdenlive_SRCS widgets/videoglwidget.cpp)
 endif(OPENGL_FOUND)
 
 if(BUILD_JogShuttle)
@@ -296,6 +295,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 
 )
 
 
@@ -321,6 +322,7 @@ target_link_libraries(kdenlive
   ${LIBMLTPLUS_LIBRARY}
   ${CMAKE_DL_LIBS}
   ${CMAKE_THREAD_LIBS_INIT}
+  kiss_fft
 )
 
 if(Q_WS_X11)
@@ -341,7 +343,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})
@@ -363,6 +365,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})