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