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

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

Fix integrated build for vs20xx
Jani Honkonen -
r201:21dc9bded068
parent child
Show More
Show file before | Show file after | Hide comments
@@ -1,50 +1,56
1 integrated_build:{
1 integrated_build:{
2 message('Running integrated build against local libs...')
2 message('Running integrated build against local libs...')
3 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
3 INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
4
4
5 !win32: {
5 !win32: {
6 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{
7 }else{
8 LIBS += -L $$CHART_BUILD_LIB_DIR
8 win32-msvc*: {
9 # hack fix for error:
10 # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'"
11 QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR
12 }else{
13 LIBS += -L $$CHART_BUILD_LIB_DIR
14 }
9 }
15 }
10
16
11 DESTDIR = $$CHART_BUILD_BIN_DIR
17 DESTDIR = $$CHART_BUILD_BIN_DIR
12
18
13 CONFIG(debug, debug|release) {
19 CONFIG(debug, debug|release) {
14 LIBS += -lQtCommercialChartd
20 LIBS += -lQtCommercialChartd
15 #this is ugly hack to work around missing rpath, it simply copies lib
21 #this is ugly hack to work around missing rpath, it simply copies lib
16 win32:{
22 win32:{
17 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
23 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
18 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
24 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
19 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
25 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
20 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
26 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
21 QMAKE_EXTRA_TARGETS +=copylib
27 QMAKE_EXTRA_TARGETS +=copylib
22 }
28 }
23 } else {
29 } else {
24 LIBS += -lQtCommercialChart
30 LIBS += -lQtCommercialChart
25
31
26 #this is ugly hack to work around missing rpath, it simply copies lib
32 #this is ugly hack to work around missing rpath, it simply copies lib
27 win32: {
33 win32: {
28 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
34 copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
29 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
35 copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
30 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
36 copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
31 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
37 PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
32 QMAKE_EXTRA_TARGETS +=copylib
38 QMAKE_EXTRA_TARGETS +=copylib
33 }
39 }
34 }
40 }
35
41
36 mac: {
42 mac: {
37 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
43 # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
38 QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest
44 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/barchart.app/Contents/MacOS/barchart
45 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/colorlineChart.app/Contents/MacOS/colorlineChart
46 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/lineChart.app/Contents/MacOS/lineChart
47 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/percentbarchart.app/Contents/MacOS/percentbarchart
48 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/stackedbarchart.app/Contents/MacOS/stackedbarchart
49 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/zoomLineChart.app/Contents/MacOS/zoomLineChart
50 QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart
45 }
51 }
46
52
47 } else {
53 } else {
48 message('Running build aginst system libs...')
54 message('Running build aginst system libs...')
49 CONFIG+=qtcommercialchart
55 CONFIG+=qtcommercialchart
50 }
56 }
General Comments 0
You need to be logged in to leave comments. Login now