##// END OF EJS Templates
Fix shadow build/jom.exe problems
Jani Honkonen -
r808:7ea08dd6d356
parent child
Show More
@@ -22,7 +22,15
22 22 #define CHARTCONFIG_H_
23 23
24 24 #include "qchartglobal.h"
25 #ifdef Q_CC_MSVC
26 // There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
27 // This is the case at least with shadow builds.
28 // http://qt-project.org/wiki/jom
29 const char *buildTime = __DATE__;
30 const char *gitHead = "unknown";
31 #else
25 32 #include "qchartversion_p.h"
33 #endif
26 34
27 35
28 36 QTCOMMERCIALCHART_BEGIN_NAMESPACE
@@ -125,7 +125,14 QMAKE_EXTRA_COMPILERS += install_build_public_headers \
125 125 install_build_private_headers \
126 126
127 127
128 !win32-msvc*: {
129
130 # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
131 # This is the case at least with shadow builds.
132 # http://qt-project.org/wiki/jom
133
128 134 chartversion.target = $$PWD/qchartversion_p.h
135
129 136 unix:{
130 137 chartversion.commands = @echo \
131 138 "const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" \\; \
@@ -139,10 +146,15 unix:{
139 146 > \
140 147 $$chartversion.target
141 148 }
149
142 150 chartversion.depends = $$HEADERS \
143 151 $$SOURCES
152
144 153 PRE_TARGETDEPS += $$PWD/qchartversion_p.h
154 QMAKE_CLEAN += $$PWD/qchartversion_p.h
145 155 QMAKE_EXTRA_TARGETS += chartversion
156 }
157
146 158 unix:QMAKE_DISTCLEAN += -r \
147 159 $$CHART_BUILD_HEADER_DIR \
148 160 $$CHART_BUILD_LIB_DIR
1 NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now