X-Git-Url: https://git.sesse.net/?p=kdenlive;a=blobdiff_plain;f=CMakeLists.txt;h=d0e99d2f2cc7409f5335d0490416bb075584488a;hp=27df197526f05e9a837c260f155d17d009e87110;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hpb=e0a180460f2671a678e5cef59eb64250d3df2723

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27df1975..d0e99d2f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,10 +2,10 @@ project(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.
-set(KDENLIVE_VERSION 0.8.3)
+set(KDENLIVE_VERSION 0.9.7)
 
 # Minimum versions of main dependencies.
-set(LIBMLT_MIN_VERSION 0.7.6)
+set(LIBMLT_MIN_VERSION 0.8.8)
 set(QT_MIN_VERSION 4.5.0)
 set(KDE_MIN_VERSION 4.3.0)
 
@@ -25,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)
@@ -79,6 +88,7 @@ add_subdirectory(renderer)
 add_subdirectory(src)
 add_subdirectory(thumbnailer)
 add_subdirectory(titles)
+add_subdirectory(testingArea)
 
 macro_display_feature_log()