Merge branch 'buildsystem' into next

[kdenlive] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45d37d452a5844276802b1310f4cc527d1b39dc9..27df197526f05e9a837c260f155d17d009e87110 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,4 @@
 project(kdenlive)
-set(catalogname kdenlive)
 
 # An odd patch version number means development version, while an even one means
 # stable release. An additional number can be used for bugfix-only releases.
@@ -7,8 +6,8 @@ set(KDENLIVE_VERSION 0.8.3)
 
 # Minimum versions of main dependencies.
 set(LIBMLT_MIN_VERSION 0.7.6)
-set(QT_MIN_VERSION 4.6.0)
-set(KDE_MIN_VERSION 4.4.0)
+set(QT_MIN_VERSION 4.5.0)
+set(KDE_MIN_VERSION 4.3.0)
 
 set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
 
@@ -39,17 +38,10 @@ include(CheckIncludeFiles)
 check_include_files(malloc.h HAVE_MALLOC_H)
 check_include_files(pthread.h HAVE_PTHREAD_H)
 
-find_package(MSGFMT REQUIRED)
-find_program(EXTRACTRC_EXECUTABLE extractrc)
-find_program(MSGFMT_EXECUTABLE msgfmt)
-find_program(MSGMERGE_EXECUTABLE msgmerge)
-find_program(XGETTEXT_EXECUTABLE xgettext)
-
 # Search KDE and dependent packages.
 find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
 include(KDE4Defaults)
 include(MacroLibrary)
-include(FindGettext)
 macro_log_feature(KDE4_FOUND
   "KDELibs"
   "KDE core libraries"
@@ -58,19 +50,11 @@ macro_log_feature(KDE4_FOUND
   ${KDE_MIN_VERSION}
 )
 
-# Find Qt core modules (QtCore and QtGui are searched by default).
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtDBus)
-macro_log_feature(QT_QTDBUS_FOUND
-  "QtDBus"
-  "Qt bindings for the D-Bus library"
-  "http://qt.nokia.com/products/qt"
-  TRUE
-  ${QT_MIN_VERSION}
-  "QtDBus library (most likely called libqt4-dbus)"
-)
+# Find Qt core modules (QtCore and QtGui).
+find_package(Qt4 ${QT_MIN_VERSION} REQUIRED)
 
 # Search MLT package.
-find_package(LIBMLT REQUIRED)
+find_package(LIBMLT ${LIBMLT_MIN_VERSION} REQUIRED)
 if(LIBMLT_VERSION VERSION_LESS ${LIBMLT_MIN_VERSION})
   set(LIBMLT_FOUND FALSE)
 endif(LIBMLT_VERSION VERSION_LESS ${LIBMLT_MIN_VERSION})
@@ -83,14 +67,14 @@ macro_log_feature(LIBMLT_FOUND
 )
 
 add_subdirectory(data)
-add_subdirectory(doc)
+macro_optional_add_subdirectory(doc)
 add_subdirectory(effects)
 add_subdirectory(export)
 add_subdirectory(icons)
 add_subdirectory(lumas)
 add_subdirectory(man)
 add_subdirectory(plugins)
-add_subdirectory(po)
+macro_optional_add_subdirectory(po)
 add_subdirectory(renderer)
 add_subdirectory(src)
 add_subdirectory(thumbnailer)
@@ -98,4 +82,4 @@ add_subdirectory(titles)
 
 macro_display_feature_log()
 
-configure_file(kdenlive-config.h.cmake kdenlive-config.h @ONLY)
+configure_file(config-kdenlive.h.cmake config-kdenlive.h @ONLY)