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

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

fix integrated build issue
Michal Klocek -
r177:1e93decbeb97
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,50 +1,49
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
4
5 !win32: {
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:'
9 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
6 LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
7 }else{
8 LIBS += -L $$CHART_BUILD_LIB_DIR
10 }
9 }
11
10
12 DESTDIR = $$CHART_BUILD_BIN_DIR
11 DESTDIR = $$CHART_BUILD_BIN_DIR
13
12
14 CONFIG(debug, debug|release) {
13 CONFIG(debug, debug|release) {
15 LIBS += -lQtCommercialChartd
14 LIBS += -lQtCommercialChartd
16 #this is ugly hack to work around missing rpath, it simply copies lib
15 #this is ugly hack to work around missing rpath, it simply copies lib
17 win32:{
16 win32:{
18 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
17 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
19 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
18 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
20 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
19 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
21 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
20 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
22 QMAKE_EXTRA_TARGETS +=copylib
21 QMAKE_EXTRA_TARGETS +=copylib
23 }
22 }
24 } else {
23 } else {
25 LIBS += -lQtCommercialChart
24 LIBS += -lQtCommercialChart
26
25
27 #this is ugly hack to work around missing rpath, it simply copies lib
26 #this is ugly hack to work around missing rpath, it simply copies lib
28 win32: {
27 win32: {
29 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
28 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
30 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
29 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
31 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
30 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
32 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
31 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
33 QMAKE_EXTRA_TARGETS +=copylib
32 QMAKE_EXTRA_TARGETS +=copylib
34 }
33 }
35 }
34 }
36
35
37 mac: {
36 mac: {
38 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
37 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
39 QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest
38 QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest
40 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart
39 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart
41 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart
40 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart
42 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart
41 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart
43 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart
42 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart
44 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart
43 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart
45 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart
44 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart
46 }
45 }
47
46
48 } else {
47 } else {
49 CONFIG+=qtcommercialchart
48 CONFIG+=qtcommercialchart
50 }
49 }
General Comments 0
You need to be logged in to leave comments. Login now