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