Merge pull request #821 from eszlari/patch-6

cmake: try to fix PPA build (#818)
2019-04-17 21:52:32 +10:00
parent 56680ff4d6 61fdb11cbc
commit bbe9a7f87e
1 changed files with 2 additions and 2 deletions
@@ -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
  )