X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2FCMakeLists.txt;h=5555746df71148e6853ee7db0c05d865657bf75f;hb=b6d6c25f1bd07f11a0ceaf32a3a5bcaeab367336;hp=556dc715e6a02aa05ab776e75f75f713f51ec112;hpb=b4fef878fdcf0cfb2fb384a59fb2d1888f1d5f4e;p=kdenlive

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 556dc715..5555746d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,13 +14,16 @@ macro_optional_find_package(QJSON)
 option(WITH_V4L "Build capture support with Video4Linux" ON)
 option(WITH_JogShuttle "Build Jog/Shuttle support" ON)
 
+
+
 if(WITH_V4L)
   # This can be changed to support FreeBSD as soon as we move to a newer V4L2
   # header.
-  check_include_files(linux/ioctl.h HAVE_LINUX_IOCTL_H)
-  if(HAVE_LINUX_IOCTL_H)
+  find_package(LibV4L2)
+  macro_log_feature(LIBV4L2_FOUND "libv4l" "Collection of video4linux support libraries" "http://hansdegoede.livejournal.com, http://linuxtv.org/hg/~hgoede/libv4l/" FALSE "" "Required for better webcam support")
+  if(LIBV4L2_FOUND)
     set(BUILD_V4L TRUE)
-  endif(HAVE_LINUX_IOCTL_H)
+  endif(LIBV4L2_FOUND)
 endif(WITH_V4L)
 
 if(WITH_JogShuttle)
@@ -63,6 +66,10 @@ macro_log_feature(Nepomuk_FOUND
   "http://nepomuk.semanticdesktop.org"
 )
 
+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")
+
+
 macro_log_feature(QJSON_FOUND
   "QJson"
   "Qt-based library that maps JSON data to QVariant objects"
@@ -134,7 +141,6 @@ list(APPEND kdenlive_SRCS
   effectslistview.cpp
   effectslistwidget.cpp
   effectstackedit.cpp
-  effectstackview.cpp
   encodingprofilesdialog.cpp
   folderprojectitem.cpp
   gentime.cpp
@@ -198,7 +204,6 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/clipproperties_ui.ui
   widgets/cliptranscode_ui.ui
   widgets/collapsiblewidget_ui.ui
-  widgets/collapsiblegroup_ui.ui
   widgets/clipstabilize_ui.ui
   widgets/colorclip_ui.ui
   widgets/colorplaneexport_ui.ui
@@ -248,7 +253,7 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/trackheader_ui.ui
   widgets/tracksconfigdialog_ui.ui
   widgets/transitionsettings_ui.ui
-  widgets/unicodedialog_ui.ui
+  widgets/unicodewidget_ui.ui
   widgets/urlval_ui.ui
   widgets/vectorscope_ui.ui
   widgets/waveform_ui.ui
@@ -261,6 +266,8 @@ kde4_add_ui_files(kdenlive_UIS
   widgets/keywordval_ui.ui
   widgets/fontval_ui.ui
   widgets/cutjobdialog_ui.ui
+  widgets/scenecutdialog_ui.ui
+  widgets/importkeyframesdialog_ui.ui
 )
 
 if(OPENGL_FOUND)
@@ -302,6 +309,7 @@ include_directories(
   ${LIBMLTPLUS_INCLUDE_DIR}
 )
 
+
 # Adds Qt definitions and include directories, and sets QT_LIBRARIES according
 # to the components requested in find_package().
 include(${QT_USE_FILE})
@@ -340,11 +348,17 @@ if(SDL_FOUND)
   target_link_libraries(kdenlive ${SDL_LIBRARY})
 endif(SDL_FOUND)
 
-if(Nepomuk_FOUND)
-  add_definitions(-DUSE_NEPOMUK)
-  include_directories(${NEPOMUK_INCLUDES})
-  target_link_libraries(kdenlive ${NEPOMUK_LIBRARIES})
-endif(Nepomuk_FOUND)
+if(NepomukCore_FOUND)
+    add_definitions(-DUSE_NEPOMUKCORE)
+    include_directories(${NEPOMUK_CORE_INCLUDE_DIR})
+    target_link_libraries(kdenlive ${NEPOMUK_CORE_LIBRARY})
+else(NepomukWidgets_FOUND)
+  if(Nepomuk_FOUND)
+    add_definitions(-DUSE_NEPOMUK)
+    include_directories(${NEPOMUK_INCLUDES})
+    target_link_libraries(kdenlive ${NEPOMUK_LIBRARIES})
+  endif(Nepomuk_FOUND)
+endif()
 
 if(QJSON_FOUND)
   add_definitions(-DUSE_QJSON)
@@ -353,6 +367,8 @@ if(QJSON_FOUND)
 endif(QJSON_FOUND)
 
 if(BUILD_V4L)
+  include_directories(${LIBV4L2_INCLUDE_DIR})
+  target_link_libraries(kdenlive ${LIBV4L2_LIBRARY})  
   add_definitions(-DUSE_V4L)
 endif(BUILD_V4L)
 
@@ -375,5 +391,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})