| @@ -6,8 +6,9 TEMPLATE = subdirs | |||||
| 6 | SUBDIRS += src examples demos test qmlplugin |
|
6 | SUBDIRS += src examples demos test qmlplugin | |
| 7 |
|
7 | |||
| 8 | integrated_build:{ |
|
8 | integrated_build:{ | |
| 9 | message('Configured for integrated build') |
|
9 | message('Configured for integrated build against local libs...') | |
| 10 | } else { |
|
10 | } else { | |
|
|
11 | message('Running build aginst system libs...') | |||
| 11 | message('Please build example test and qmlplugin after installing library.') |
|
12 | message('Please build example test and qmlplugin after installing library.') | |
| 12 | } |
|
13 | } | |
| 13 |
|
14 | |||
| @@ -1,5 +1,4 | |||||
| 1 | integrated_build:{ |
|
1 | integrated_build:{ | |
| 2 | message('Running integrated build against local libs...') |
|
|||
| 3 | INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR |
|
2 | INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR | |
| 4 |
|
3 | |||
| 5 | !win32: { |
|
4 | !win32: { | |
| @@ -39,16 +38,12 integrated_build:{ | |||||
| 39 |
|
38 | |||
| 40 | mac: { |
|
39 | mac: { | |
| 41 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX |
|
40 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |
| 42 | QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest |
|
41 | exists($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) { | |
| 43 |
QMAKE_POST_LINK |
|
42 | QMAKE_POST_LINK+=install_name_tool -change "libQtCommercialChartd.1.dylib" $$CHART_BUILD_LIB_DIR"/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET | |
| 44 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart |
|
43 | message($$QMAKE_POST_LINK) | |
| 45 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart |
|
44 | } | |
| 46 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart |
|
|||
| 47 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart |
|
|||
| 48 | QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart |
|
|||
| 49 | } |
|
45 | } | |
| 50 |
|
46 | |||
| 51 | } else { |
|
47 | } else { | |
| 52 | message('Running build aginst system libs...') |
|
|||
| 53 | CONFIG+=qtcommercialchart |
|
48 | CONFIG+=qtcommercialchart | |
| 54 | } |
|
49 | } | |
General Comments 0
You need to be logged in to leave comments.
Login now