]> git.lyx.org Git - features.git/commitdiff
Cmake build. Use 2.0.0 git-tag to receive the number of commits.
authorKornel Benko <kornel@lyx.org>
Sat, 30 Nov 2013 18:53:30 +0000 (19:53 +0100)
committerKornel Benko <kornel@lyx.org>
Sat, 30 Nov 2013 18:53:30 +0000 (19:53 +0100)
This number is only used for created package name.

CMakeLists.txt

index c0fd67385226c0da9ca46623b7cf04ec029234dd..e72aad5e15adb89673b72f8c5b08b2c4f098027b 100644 (file)
@@ -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.