##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Fix copy errors when running install in windows
Jani Honkonen -
r1047:ce7e3633d562
parent child
Show More
Side by Side Unified
Context file:
r1047:ce7e3633d562 Loading diff...:
Show file before | Show file after | Hide comments
@@ -138,15 +138,24 install_build_private_headers.CONFIG += target_predeps \
138
138
139 QMAKE_EXTRA_COMPILERS += install_build_public_headers \
139 QMAKE_EXTRA_COMPILERS += install_build_public_headers \
140 install_build_private_headers \
140 install_build_private_headers \
141
142
141
143 win32:{
142 win32:{
144 bintarget.CONFIG +=no_check_exist
143 bintarget.CONFIG += no_check_exist
145 bintarget.files = $$CHART_BUILD_LIB_DIR\\*.dll $$CHART_BUILD_LIB_DIR\\*.pdb
144 bintarget.files = $$CHART_BUILD_LIB_DIR\\*.dll
145 win32-msvc*:CONFIG(debug, debug|release): {
146 bintarget.files += $$CHART_BUILD_LIB_DIR\\*.pdb
147 }
146 bintarget.path = $$[QT_INSTALL_BINS]
148 bintarget.path = $$[QT_INSTALL_BINS]
147 libtarget.CONFIG +=no_check_exist
149
148 libtarget.files = $$CHART_BUILD_LIB_DIR\\*.a $$CHART_BUILD_LIB_DIR\\*.prl $$CHART_BUILD_LIB_DIR\\*.lib
150 libtarget.CONFIG += no_check_exist
151 libtarget.files = $$CHART_BUILD_LIB_DIR\\*.prl
152 win32-msvc*: {
153 libtarget.files += $$CHART_BUILD_LIB_DIR\\*.lib
154 } else {
155 libtarget.files += $$CHART_BUILD_LIB_DIR\\*.a
156 }
149 libtarget.path = $$[QT_INSTALL_LIBS]
157 libtarget.path = $$[QT_INSTALL_LIBS]
158
150 DLLDESTDIR = $$CHART_BUILD_BIN_DIR
159 DLLDESTDIR = $$CHART_BUILD_BIN_DIR
151 INSTALLS += bintarget libtarget
160 INSTALLS += bintarget libtarget
152 }else{
161 }else{
General Comments 0
You need to be logged in to leave comments. Login now