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