[PATCH 2/3] qmake: fix a 'GIT_DIR' issue
Lubomir I. Ivanov
neolit123 at gmail.com
Tue Dec 3 13:00:21 UTC 2013
From: "Lubomir I. Ivanov" <neolit123 at gmail.com>
"'GIT_DIR' is not recognized as an internal or external command",
is reported if qmake is runned on Win32.
To solve that we set a explicit syntax for Win32 that uses "Set.."
Signed-off-by: Lubomir I. Ivanov <neolit123 at gmail.com>
---
subsurface-gen-version.pri | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri
index 6b65f1d..4a8fc9c 100644
--- a/subsurface-gen-version.pri
+++ b/subsurface-gen-version.pri
@@ -4,13 +4,15 @@ macx: VER_OS = darwin
unix: !macx: VER_OS = linux
win32: VER_OS = win
exists(.git/HEAD): {
+ win32: SET_GIT_DIR = set GIT_DIR
+ else: SET_GIT_DIR = GIT_DIR
GIT_HEAD = .git/HEAD
VERSION_SCRIPT = $$PWD/scripts/get-version
# always use linux here -------------------vvv so we get the true full version
FULL_VERSION = "`$$VERSION_SCRIPT linux`"
PRODVERSION_STRING = $$system("sh scripts/get-version win $$FULL_VERSION || $${VERSION}.0.0")
VERSION_STRING = $$system("sh scripts/get-version linux $$FULL_VERSION || $${VERSION}")
- version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD")
+ version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("$$SET_GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD")
version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT}
version_h.input = GIT_HEAD
version_h.output = $$VERSION_FILE
--
1.7.11.msysgit.0
More information about the subsurface
mailing list