diff options
| author | TanninOne <seppleviathan@gmx.de> | 2015-10-14 19:52:44 +0200 |
|---|---|---|
| committer | TanninOne <seppleviathan@gmx.de> | 2015-10-14 19:52:44 +0200 |
| commit | f25a51446c4c0d6e66a1d011ddbcc50d98e0f1c7 (patch) | |
| tree | 36398767aee155f703c255511bbe0e6b8c7919c4 /src/organizer.pro | |
| parent | 7d93a9a2003f31188e4da8cbcd7e5df0352bb900 (diff) | |
| parent | ec07d3d4d9ec2245f0b23edf6746f4ae1e5dfce4 (diff) | |
Merge pull request #329 from ThosRTanner/master
Update to scons build
Diffstat (limited to 'src/organizer.pro')
| -rw-r--r-- | src/organizer.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/organizer.pro b/src/organizer.pro index 808fdeb5..261e3c1c 100644 --- a/src/organizer.pro +++ b/src/organizer.pro @@ -310,7 +310,9 @@ DEFINES += UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS NOMI DEFINES += BOOST_DISABLE_ASSERTS NDEBUG QT_MESSAGELOGCONTEXT
#DEFINES += QMLJSDEBUGGER
-HGID = $$system(hg id -i)
+# If we are running mercurial get the build ID from that. If we aren't, at least
+# don't generate a strange message whenever you open the project
+HGID = $$system(if exist $OUT_PWD\\..\\.hg (hg id -i) else (echo 'Unknown'))
DEFINES += HGID=\\\"$${HGID}\\\"
CONFIG(debug, debug|release) {
|