aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge

Browse Source 
--HG--
branch : develop
This commit is contained in:
dismine 2014-11-08 14:07:21 +02:00
commit b964143503
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/app/app.pro
View File

@ -180,6 +180,9 @@ isEmpty(PREFIX){
PREFIX = $$DEFAULT_PREFIX PREFIX = $$DEFAULT_PREFIX
} }
# Keep path to all files with standard measurements we support right now
INSTALL_STANDARD_MEASHUREMENTS += share/resources/tables/standard/GOST_man_ru.vst
# Prefix for binary file. # Prefix for binary file.
unix:!macx{ unix:!macx{
# Add to this variable all translation files that you want install with program. # Add to this variable all translation files that you want install with program.
@ -194,8 +197,7 @@ unix:!macx{
share/translations/valentina_it_IT.qm \ share/translations/valentina_it_IT.qm \
share/translations/valentina_nl_NL.qm share/translations/valentina_nl_NL.qm
# Keep path to all files with standard measurements we support right now
INSTALL_STANDARD_MEASHUREMENTS += share/resources/tables/standard/GOST_man_ru.vst
DATADIR =$$PREFIX/share DATADIR =$$PREFIX/share
DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\" DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
@ -226,14 +228,15 @@ unix:!macx{
translations \ translations \
standard standard
} }
}else{ }
macx{
# Some macx stuff # Some macx stuff
QMAKE_MAC_SDK = "/Developer/SDKs/MacOSX10.6.sdk" QMAKE_MAC_SDK = macosx
QMAKE_MACOSX_DEPLOYMENT_TARGET = "10.5"
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
# Path to resources in app bundle # Path to resources in app bundle
RESOURCES_DIR = "Contents/Resources" RESOURCES_DIR = "Contents/Resources"
FRAMEWORKS_DIR = "Contents/Frameworks"
# On macx we will use app bundle. Bundle doesn't need bin directory inside. # On macx we will use app bundle. Bundle doesn't need bin directory inside.
# See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula. # See issue #166: Creating OSX Homebrew (Mac OS X package manager) formula.
target.path = $$PREFIX/ target.path = $$PREFIX/
@ -302,10 +305,13 @@ unix:!macx{
TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj" TRANSLATION_nl_NL.path = "$$RESOURCES_DIR/translations/nl_NL.lproj"
QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL QMAKE_BUNDLE_DATA += TRANSLATION_nl_NL
} }
frameworks.path = $$FRAMEWORKS_DIR
frameworks.files += $$files($${OUT_PWD}/../libs/qmuparser/$${DESTDIR}/*)
frameworks.files += $$files($${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR}/*)
message( framework files $$frameworks.files )
# logo on macx. # logo on macx.
icon.files = "Valentina.icns" ICON = ../../dist/Valentina.icns
icon.path = $$RESOURCES_DIR
# Copy to bundle standard measurements files # Copy to bundle standard measurements files
standard.path = $$RESOURCES_DIR/tables/standard/ standard.path = $$RESOURCES_DIR/tables/standard/
@ -313,7 +319,9 @@ unix:!macx{
QMAKE_BUNDLE_DATA += \ QMAKE_BUNDLE_DATA += \
standard \ standard \
icons \ frameworks
} }
# Run generation *.qm file for available *.ts files each time you run qmake. # Run generation *.qm file for available *.ts files each time you run qmake.
@ -358,6 +366,7 @@ else:unix: LIBS += -L$${OUT_PWD}/../libs/vpropertyexplorer/$${DESTDIR} -lvproper
INCLUDEPATH += $${PWD}/../libs/vpropertyexplorer INCLUDEPATH += $${PWD}/../libs/vpropertyexplorer
DEPENDPATH += $${PWD}/../libs/vpropertyexplorer DEPENDPATH += $${PWD}/../libs/vpropertyexplorer
# Strip after you link all libaries. # Strip after you link all libaries.
CONFIG(release, debug|release){ CONFIG(release, debug|release){
unix:!macx{ unix:!macx{
@ -367,3 +376,9 @@ CONFIG(release, debug|release){
QMAKE_POST_LINK += objcopy --add-gnu-debuglink $(TARGET).debug $(TARGET) QMAKE_POST_LINK += objcopy --add-gnu-debuglink $(TARGET).debug $(TARGET)
} }
} }
macx{
# run macdeployqt to include all qt libraries in packet
QMAKE_POST_LINK += $$[QT_INSTALL_BINS]/macdeployqt $${OUT_PWD}/$${DESTDIR}/$${TARGET}.app
}