diff options
author | Tero Ahola <tero.ahola@digia.com> | 2012-06-07 13:21:08 +0300 |
---|---|---|
committer | Tero Ahola <tero.ahola@digia.com> | 2012-06-07 14:26:26 +0300 |
commit | 9a2b5d956bb6cc0e1a9377e485805c0523e1b07f (patch) | |
tree | fca6995066c3bb9b7b9ddef9ffee8a96b129b71c /config.pri | |
parent | faa10209176d04c51575cfb02dbfbde1f94cf748 (diff) |
OSX install name tool now executed only on QtCommercialChart library during build
Diffstat (limited to 'config.pri')
-rw-r--r-- | config.pri | 20 |
1 files changed, 2 insertions, 18 deletions
@@ -79,25 +79,9 @@ development_build: { CONFIG(debug, debug|release) { mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug) win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) - } - - LIBS += -l$$LIBRARY_NAME - - mac: { - # This is a hack; we define variables for easier install_name_tool calls from project files of OSX executables/libraries - # install_name_tool is used to update the dependencies to chart library to match the local build folder - MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" - CONFIG(debug, debug|release) { - MAC_CHARTS_LIB_NAME = "lib"$$LIBRARY_NAME".1.dylib" - } - MAC_POST_LINK_PREFIX = install_name_tool -change $$MAC_CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$MAC_CHARTS_LIB_NAME - MAC_DEMOS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET - MAC_EXAMPLES_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET - MAC_TESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET - MAC_AUTOTESTS_BIN_DIR = $$CHART_BUILD_BIN_DIR"/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET - MAC_PLUGINS_BIN_DIR = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib" } - + + LIBS += -l$$LIBRARY_NAME } else { CONFIG += qtcommercialchart } |