From 1d247751c3495d662db03efdd4a141230f68932c Mon Sep 17 00:00:00 2001 From: "bors[bot]" Date: Thu, 20 Dec 2018 08:26:14 +0000 Subject: [PATCH] Merge #550 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 550: Revert "[cmake] mark dirty tree in the version string" r=Saviq a=Saviq This reverts commit 760c9e2dd57df5d5291e0a989dfc46903d5825f9. Unfortunately snapcraft dirtifies the build dir on Launchpad, so all our builds from there now have a `-dirty` suffix. Co-authored-by: MichaƂ Sawicz --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 31cee3e2fd..54ee2aa7be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,7 +47,7 @@ add_subdirectory(3rd-party) find_package(Qt5Core REQUIRED) find_package(Qt5Network REQUIRED) -execute_process(COMMAND git describe --dirty +execute_process(COMMAND git describe WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} OUTPUT_VARIABLE MULTIPASS_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)