diff options
| author | Ken Moore <moorekou@gmail.com> | 2016-01-11 15:51:52 -0500 |
|---|---|---|
| committer | Ken Moore <moorekou@gmail.com> | 2016-01-11 15:51:52 -0500 |
| commit | 4a94520f2e6eb55f9d651321b15ed638404a66bb (patch) | |
| tree | 8d4b3f7d8ec2cf262e4cfc595ab86768b3820f81 /lumina-config | |
| parent | Start the work of abstracting out the OS-detection/build system from the indi... (diff) | |
| download | lumina-4a94520f2e6eb55f9d651321b15ed638404a66bb.tar.gz lumina-4a94520f2e6eb55f9d651321b15ed638404a66bb.tar.bz2 lumina-4a94520f2e6eb55f9d651321b15ed638404a66bb.zip | |
Large cleanup of the Lumina project files and OS-detection/support systems.
1) Setup all the subprojects to use the new OS-detect.pri subfile
2) Automatically detect/set the build datetime string for the project when qmake is run.
3) Automatically read/embed the current GIT revision into the Lumina version string
4) Remove the old QtConfig shortcut function from the LuminaOS class (and all templates).
Diffstat (limited to 'lumina-config')
| -rw-r--r-- | lumina-config/lumina-config.pro | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro index df0d6417..04e15d7a 100644 --- a/lumina-config/lumina-config.pro +++ b/lumina-config/lumina-config.pro @@ -1,17 +1,12 @@ +include("$${PWD}/../OS-detect.pri") QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets x11extras network TARGET = lumina-config -isEmpty(PREFIX) { - PREFIX = /usr/local -} -target.path = $$DESTDIR$$PREFIX/bin -isEmpty(LIBPREFIX) { - LIBPREFIX = $$PREFIX/lib -} +target.path = $$DESTDIR$${L_BINDIR} TEMPLATE = app @@ -43,18 +38,9 @@ FORMS += mainUI.ui \ # RESOURCES+= lumina-config.qrc -INCLUDEPATH += ../libLumina $$PREFIX/include +LIBS += -lLuminaUtils -LIBS += -L../libLumina -L$$LIBPREFIX -lLuminaUtils -isEmpty(QT5LIBDIR) { - QT5LIBDIR = $$PREFIX/lib/qt5 -} - -LRELEASE = $$QT5LIBDIR/bin/lrelease - - -QMAKE_LIBDIR = ../libLumina DEPENDPATH += ../libLumina TRANSLATIONS = i18n/lumina-config_af.ts \ @@ -120,8 +106,8 @@ TRANSLATIONS = i18n/lumina-config_af.ts \ i18n/lumina-config_zh_TW.ts \ i18n/lumina-config_zu.ts -dotrans.path=$$PREFIX/share/Lumina-DE/i18n/ -dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$$PREFIX/share/Lumina-DE/i18n/ +dotrans.path=$${L_SHAREDIR}/Lumina-DE/i18n/ +dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/Lumina-DE/i18n/ INSTALLS += target dotrans |