From 7033b157936370ec3de2d20f01d70e8512990b51 Mon Sep 17 00:00:00 2001 From: Kornel Benko Date: Sat, 30 Nov 2013 19:53:30 +0100 Subject: [PATCH] Cmake build. Use 2.0.0 git-tag to receive the number of commits. This number is only used for created package name. --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c0fd673852..e72aad5e15 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -279,7 +279,8 @@ if (LYX_LOCALVERSIONING) FIND_PROGRAM(LYX_GITVERSION git) #message(STATUS "gitversion = ${LYX_GITVERSION}") if(LYX_GITVERSION) - EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "describe" WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) + EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD + WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE) if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$") # We will add offset of 40000 to get appropriate value to # previous svn.