QuasarApp/SoundBand
4
0
Fork 0
mirror of https://github.com/QuasarApp/SoundBand.git synced 2025-04-26 15:24:31 +00:00
Code Issues Projects Releases Wiki Activity

fix build #77

Browse Source
This commit is contained in:
Andrei Yankovich 2018-09-30 16:37:21 +03:00
parent 304a4fe571
commit d5eaf28c45
11 changed files with 29 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -51,3 +51,7 @@ installer/packages/SoundBand/stage
# QtCtreator CMake
CMakeLists.txt.user*
installer/installerApp
*.log
*.dat

2
CQtDeployer

@ -1 +1 @@
Subproject commit def5cafdaad6aa2b2c91e878d872121038b225cf
Subproject commit 7492728b745ec644f8abe6af002de1aeba1e8518

2
QuasarAppLib

@ -1 +1 @@
Subproject commit 920ca5e046dea200682dbc1a2a0be931468e8d72
Subproject commit 381518d52a122f6892e12d8480de40d61ed44e2c

2
SoundBand.pro
View File

@ -1,7 +1,7 @@
TEMPLATE = subdirs
CONFIG += ordered
include($$PWD/installer/deploy/deployFiles.pri)
message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES)
ENABLE_SNAP = 0 #only linux

2
SoundBand/SoundBand.pro
View File

@ -52,7 +52,7 @@ HEADERS += \
playlistsmodel.h \
currentplaylistmodel.h
include($$PWD/../installer/deploy/deployFiles.pri)
include($$PWD/../deploy.pri)
include($$PWD/../Sync/Sync.pri)
QMAKE_LFLAGS += -Wl,-rpath,"'$$DESTDIR'"

10
Sync/Sync.pri
View File

@ -9,7 +9,15 @@
SYNC_LIB = 1
#DEPENDS
OLD_DEST_DIR=$$DESTDIR
OLD_SOUND=$$SOUND_BAND_MODULE;
LIBS += -L"$$PWD/../installer/packages/SoundBand/data/" -lSync
SOUND_BAND_MODULE = sync
include($$PWD/../deploy.pri)
LIBS += -L"$$DESTDIR/" -lSync
SOUND_BAND_MODULE = $$OLD_SOUND
DESTDIR = $$OLD_DEST_DIR
INCLUDEPATH += "$$PWD/"

2
Sync/Sync.pro
View File

@ -8,7 +8,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
TARGET = Sync
TEMPLATE = lib
include($$PWD/../installer/deploy/deployFiles.pri)
include($$PWD/../deploy.pri);
DISTFILES += \
sql/InitLacaleDataBase.sql

5
deploy.pri Executable file
View File

@ -0,0 +1,5 @@
DESTDIR=$$PWD/installer/packages/SoundBand/data
equals(SOUND_BAND_MODULE, "test" ) {
DESTDIR=$$PWD/installer/packages/SoundBand.Tests/data
}

2
installer/installer.pro
View File

@ -22,7 +22,7 @@ QML_DIR = $$PWD/../SoundBand
WINDEPLY = $$QT_DIR/windeployqt.exe
MACDEPLY = $$QT_DIR/macdeployqt
LINUXDEPLOY = $$PWD/../CQtDeployer/build/CQtDeployer
LINUXDEPLOY = $$PWD/../CQtDeployer/build/cqtdeployer
message( QML_DIR = $$QML_DIR)
message( WINDEPLY = $$WINDEPLY)

2
installer/packages/SoundBand/snap.pro
View File

@ -14,7 +14,7 @@ snapApp.output = $$SNAPCRAFT
LINUXDEPLOY = $$PWD/../../../CQtDeployer/build/CQtDeployer
QT_DIR = $$dirname(QMAKE_QMAKE)
QML_DIR = $$QT_DIR/../qml
QML_DIR = $$PWD/../../../SoundBand
unix {
message($$DESTDIR);

6
tests/tests.pro
View File

@ -5,6 +5,9 @@ CONFIG += qt console warn_on depend_includepath testcase
CONFIG -= app_bundle
TEMPLATE = app
TARGET = test
SOUND_BAND_MODULE=test
SOURCES += \
tst_synctest.cpp
@ -13,6 +16,5 @@ SOURCES += \
RESOURCES += \
res.qrc
DESTDIR = $$PWD/../installer/packages/SoundBand.Tests/data
include($$PWD/../deploy.pri)
include($$PWD/../Sync/Sync.pri)