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

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

Bubblegum fix for vs2010 integrated build
Jani Honkonen -
r130:b455dc01e411
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,42 +1,50
1 integrated_build:{
1 integrated_build:{
2 message('Internal build within charts core source tree')
2 message('Internal build within charts core source tree')
3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
3 INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
4
5 !win32: {
6 # What is the purpose of this? We are already adding our lib depending on the release type below.
7 # Plus this causes an error in vs2010 build:
8 # LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'
4 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
9 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
10 }
11
5 DESTDIR = $$CHART_BUILD_BIN_DIR
12 DESTDIR = $$CHART_BUILD_BIN_DIR
13
6 CONFIG(debug, debug|release) {
14 CONFIG(debug, debug|release) {
7 LIBS += -lQtCommercialChartd
15 LIBS += -lQtCommercialChartd
8 #this is ugly hack to work around missing rpath, it simply copies lib
16 #this is ugly hack to work around missing rpath, it simply copies lib
9 win32:{
17 win32:{
10 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
18 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
11 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
19 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
12 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
20 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
13 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
21 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
14 QMAKE_EXTRA_TARGETS +=copylib
22 QMAKE_EXTRA_TARGETS +=copylib
15 }
23 }
16 } else {
24 } else {
17 LIBS += -lQtCommercialChart
25 LIBS += -lQtCommercialChart
18
26
19 #this is ugly hack to work around missing rpath, it simply copies lib
27 #this is ugly hack to work around missing rpath, it simply copies lib
20 win32: {
28 win32: {
21 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
29 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
22 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
30 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
23 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
31 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
24 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
32 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
25 QMAKE_EXTRA_TARGETS +=copylib
33 QMAKE_EXTRA_TARGETS +=copylib
26 }
34 }
27 }
35 }
28
36
29 mac: {
37 mac: {
30 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
38 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
31 QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest
39 QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest
32 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart
40 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart
33 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart
41 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart
34 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart
42 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart
35 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart
43 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart
36 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart
44 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart
37 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart
45 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart
38 }
46 }
39
47
40 } else {
48 } else {
41 CONFIG+=qtcommercialchart
49 CONFIG+=qtcommercialchart
42 }
50 }
General Comments 0
You need to be logged in to leave comments. Login now