--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-02-29 11:57:30 +02:00
parent 018fd88f25
commit 738b7c499a
3 changed files with 8 additions and 8 deletions

View File

@ -1,7 +1,7 @@
# Keep path to all files with standard measurements we support right now # Keep path to all files with standard measurements we support right now
INSTALL_STANDARD_MEASHUREMENTS += $$PWD/share/tables/standard/GOST_man_ru.vst INSTALL_STANDARD_MEASUREMENTS += $$PWD/share/tables/standard/GOST_man_ru.vst
# Keep path to all template files we have right now # Keep path to all template files we have right now
INSTALL_STANDARD_TEMPLATES += $$PWD/share/tables/templates/template_all_measurements.vit INSTALL_STANDARD_TEMPLATES += $$PWD/share/tables/templates/template_all_measurements.vit
copyToDestdir($$INSTALL_STANDARD_MEASHUREMENTS, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard)) copyToDestdir($$INSTALL_STANDARD_MEASUREMENTS, $$shell_path($${OUT_PWD}/$$DESTDIR/tables/standard))

View File

@ -168,7 +168,7 @@ QMAKE_EXTRA_COMPILERS += diagrams
QMAKE_CLEAN += $${OUT_PWD}/$${DESTDIR}/diagrams.rcc QMAKE_CLEAN += $${OUT_PWD}/$${DESTDIR}/diagrams.rcc
# INSTALL_STANDARD_MEASHUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri # INSTALL_STANDARD_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri
include(../tables.pri) include(../tables.pri)
copyToDestdir($$INSTALL_STANDARD_TEMPLATES, $$shell_path($${OUT_PWD}/$${DESTDIR}/tables/templates)) copyToDestdir($$INSTALL_STANDARD_TEMPLATES, $$shell_path($${OUT_PWD}/$${DESTDIR}/tables/templates))
include(../translations.pri) include(../translations.pri)
@ -223,7 +223,7 @@ unix{
# Copy to bundle standard measurements files # Copy to bundle standard measurements files
standard.path = $$RESOURCES_DIR/tables/standard/ standard.path = $$RESOURCES_DIR/tables/standard/
standard.files = $$INSTALL_STANDARD_MEASHUREMENTS standard.files = $$INSTALL_STANDARD_MEASUREMENTS
# Copy to bundle templates files # Copy to bundle templates files
templates.path = $$RESOURCES_DIR/tables/templates/ templates.path = $$RESOURCES_DIR/tables/templates/

View File

@ -187,7 +187,7 @@ message(Examples: $$[QT_INSTALL_EXAMPLES])
# Path to recource file. # Path to recource file.
win32:RC_FILE = share/resources/valentina.rc win32:RC_FILE = share/resources/valentina.rc
# INSTALL_STANDARD_MEASHUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri # INSTALL_STANDARD_MEASUREMENTS and INSTALL_STANDARD_TEMPLATES inside tables.pri
include(../tables.pri) include(../tables.pri)
win32 { win32 {
@ -233,7 +233,7 @@ unix{
# Path to standard measurement after installation # Path to standard measurement after installation
standard.path = /usr/share/$${TARGET}/tables/standard/ standard.path = /usr/share/$${TARGET}/tables/standard/
standard.files = $$INSTALL_STANDARD_MEASHUREMENTS standard.files = $$INSTALL_STANDARD_MEASUREMENTS
# Path to templates after installation # Path to templates after installation
templates.path = /usr/share/$${TARGET}/tables/templates/ templates.path = /usr/share/$${TARGET}/tables/templates/
@ -283,7 +283,7 @@ unix{
# Copy to bundle standard measurements files # Copy to bundle standard measurements files
standard.path = $$RESOURCES_DIR/tables/standard/ standard.path = $$RESOURCES_DIR/tables/standard/
standard.files = $$INSTALL_STANDARD_MEASHUREMENTS standard.files = $$INSTALL_STANDARD_MEASUREMENTS
# Copy to bundle templates files # Copy to bundle templates files
templates.path = $$RESOURCES_DIR/tables/templates/ templates.path = $$RESOURCES_DIR/tables/templates/
@ -361,7 +361,7 @@ win32:*-g++ {
INSTALLS += package INSTALLS += package
package_tables.path = $${OUT_PWD}/../../../package/valentina/tables/standard package_tables.path = $${OUT_PWD}/../../../package/valentina/tables/standard
package_tables.files += $$INSTALL_STANDARD_MEASHUREMENTS package_tables.files += $$INSTALL_STANDARD_MEASUREMENTS
INSTALLS += package_tables INSTALLS += package_tables
package_templates.path = $${OUT_PWD}/../../../package/valentina/tables/templates package_templates.path = $${OUT_PWD}/../../../package/valentina/tables/templates