From 61fdb11cbc1e66138f095f8545d827a49d472310 Mon Sep 17 00:00:00 2001 From: eszlari Date: Wed, 17 Apr 2019 13:11:15 +0200 Subject: [PATCH] cmake: try to fix PPA build (#818) --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 049bb19f1..ac8fab803 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,8 +64,8 @@ if(EXISTS "${CMAKE_SOURCE_DIR}/.git") elseif(UNIX AND NOT APPLE) # Fallback for Ubuntu/Launchpad (extracts Git hash from debian/changelog rather than Git repo) # (see https://answers.launchpad.net/launchpad/+question/678556) - execute_process(COMMAND sh debian/gitfromlog.sh debian/changelog - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + execute_process(COMMAND sh -c "grep -Po '(?<=-)(([a-z0-9])\\w+)(?=\\+)' -m 1 changelog" + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/debian OUTPUT_VARIABLE GIT_HASH OUTPUT_STRIP_TRAILING_WHITESPACE )