X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=CMakeLists.txt;h=45aeff186491e71aa8851783b2b980aa3d265d18;hb=f6e2d5e00d13dbc8c511b127faa9f127a8decab1;hp=20b31562fb6ca8d0fa937717f3532e4c75235176;hpb=da9d9c783997d952db8ce51dd45c4bee18d2eb1d;p=kdenlive

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20b31562..45aeff18 100644
--- 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.
@@ -26,7 +25,16 @@ if(NOT RELEASE_BUILD)
         ${CMAKE_CURRENT_SOURCE_DIR}
         ARGS "describe --tags"
         OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
+        RETURN_VALUE TAG_RESULT
       )
+      # git describe --tags failed, for example it fails if repo was checked with depth=1
+      if(NOT ${TAG_RESULT} EQUAL 0)
+        exec_program(${GIT_EXECUTABLE}
+          ${CMAKE_CURRENT_SOURCE_DIR}
+          ARGS "describe --always"
+          OUTPUT_VARIABLE KDENLIVE_GIT_REVISION
+        )
+      endif(NOT ${TAG_RESULT} EQUAL 0)
       message("Current Kdenlive Git revision is ${KDENLIVE_GIT_REVISION}")
       set(VERSION "\"${KDENLIVE_VERSION} (rev. ${KDENLIVE_GIT_REVISION})\"")
     else(GIT_FOUND)
@@ -39,17 +47,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,8 +59,8 @@ macro_log_feature(KDE4_FOUND
   ${KDE_MIN_VERSION}
 )
 
-# Find Qt core modules.
-find_package(Qt4 ${QT_MIN_VERSION} REQUIRED QtCore QtDBus)
+# Find Qt core modules (QtCore and QtGui).
+find_package(Qt4 ${QT_MIN_VERSION} REQUIRED)
 
 # Search MLT package.
 find_package(LIBMLT ${LIBMLT_MIN_VERSION} REQUIRED)
@@ -90,4 +91,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)