| @@ -37,23 +37,36 integrated_build:{ | |||||
| 37 | } |
|
37 | } | |
| 38 |
|
38 | |||
| 39 | mac: { |
|
39 | mac: { | |
|
|
40 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |||
| 40 | CHARTS_LIB_NAME = libQtCommercialChart.1.dylib |
|
41 | CHARTS_LIB_NAME = libQtCommercialChart.1.dylib | |
| 41 | CONFIG(debug, debug|release) { |
|
42 | CONFIG(debug, debug|release) { | |
| 42 | CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib |
|
43 | CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib | |
| 43 | } |
|
44 | } | |
| 44 |
|
45 | TARGET_PATH = "" | ||
| 45 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX |
|
46 | exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) { | |
| 46 |
|
|
47 | TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET | |
| 47 | QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET |
|
48 | } | |
|
|
49 | exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) { | |||
|
|
50 | # Executable in test folder | |||
|
|
51 | TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET | |||
|
|
52 | } | |||
|
|
53 | exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) { | |||
|
|
54 | # Executable in test folder with custom target "tst_NNN" | |||
|
|
55 | TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET | |||
|
|
56 | } | |||
|
|
57 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { | |||
|
|
58 | # Plugin | |||
|
|
59 | TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib" | |||
|
|
60 | } | |||
|
|
61 | !isEmpty (TARGET_PATH) { | |||
|
|
62 | QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$TARGET_PATH | |||
| 48 | #message($$QMAKE_POST_LINK) |
|
63 | #message($$QMAKE_POST_LINK) | |
| 49 | } |
|
64 | } | |
| 50 |
|
65 | |||
| 51 |
# Hack to make qml plugins available as internal build versions |
|
66 | # Hack to make qml plugins available as internal build versions | |
| 52 | # the internal version of the QtCommercial Charts library on OSX |
|
|||
| 53 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { |
|
67 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { | |
| 54 |
QMAKE_POST_LINK += "$$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR |
|
68 | QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR" | |
| 55 | QMAKE_POST_LINK += "install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"" |
|
69 | #message($$QMAKE_POST_LINK) | |
| 56 | # message($$QMAKE_POST_LINK) |
|
|||
| 57 | } |
|
70 | } | |
| 58 | } |
|
71 | } | |
| 59 |
|
72 | |||
General Comments 0
You need to be logged in to leave comments.
Login now