From 15aaf6f4ca9753a4b4c05ccea6e9de4693bd7454 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 25 Jan 2014 22:20:34 -0500 Subject: [PATCH] add TIMEOUT 1 to git shortlog in configure script For some reason executing git shortlog in Qt Creator cmake project import hangs. This is a workaround so that it is still possible to use Qt Creator without changing the normal build, in which git shortlog will certainly complete in 1 second. --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15f6cec0e..196cfee9d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -357,7 +357,8 @@ IF(GIT_FOUND) COMMAND ${GIT_EXECUTABLE} shortlog -sne COMMAND cut -c8- OUTPUT_FILE ${CONTRIBUTORS} - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + TIMEOUT 1) ENDIF(GIT_FOUND) SET(lmms_EMBEDDED_RESOURCES ${CMAKE_SOURCE_DIR}/AUTHORS ${CMAKE_SOURCE_DIR}/COPYING ${CONTRIBUTORS})