From 5dcfa8869129e1323438fdf02d2eeb4321029a1c Mon Sep 17 00:00:00 2001 From: dismine Date: Wed, 28 Jan 2015 17:33:01 +0200 Subject: [PATCH] Fix for Mac OS. Issue Makefile overriding commands for target "bin/valentina.app/Contents/Frameworks/". --HG-- branch : develop --- src/app/app.pro | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/app/app.pro b/src/app/app.pro index d69191a0a..ac7295cd3 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -306,11 +306,11 @@ unix{ QMAKE_BUNDLE_DATA += TRANSLATION_id_ID } - qmuparser.path = $$FRAMEWORKS_DIR - qmuparser.files = $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/ - qmuparser.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib - vpropertyexplorer.path = $$FRAMEWORKS_DIR - vpropertyexplorer.files = $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/ + # Symlinks also good names for copying. Make will take origin file and copy them with using symlink name. + # For bundle this names more then enough. We don't need care much about libraries versions. + libraries.path = $$FRAMEWORKS_DIR + libraries.files += $${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/libqmuparser.2.dylib + libraries.files = $${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/libvpropertyexplorer.1.dylib # logo on macx. @@ -322,9 +322,7 @@ unix{ QMAKE_BUNDLE_DATA += \ standard \ - qmuparser \ - vpropertyexplorer - + libraries } }