peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

better support for cross-compiling

Browse Source
This commit is contained in:
Uwe Rathmann 2020-05-24 12:19:28 +02:00
parent 38259611ab
commit 02115c8e7d
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
features/qskconfig.pri
View File

@ -23,6 +23,7 @@ QSK_INSTALL_HEADERS = $${QSK_INSTALL_PREFIX}/include
QSK_INSTALL_LIBS = $${QSK_INSTALL_PREFIX}/lib QSK_INSTALL_LIBS = $${QSK_INSTALL_PREFIX}/lib
QSK_INSTALL_BINS = $${QSK_INSTALL_PREFIX}/bin QSK_INSTALL_BINS = $${QSK_INSTALL_PREFIX}/bin
QSK_INSTALL_PLUGINS = $${QSK_INSTALL_PREFIX}/plugins QSK_INSTALL_PLUGINS = $${QSK_INSTALL_PREFIX}/plugins
QSK_INSTALL_EXAMPLES = $${QSK_INSTALL_PREFIX}/examples
CONFIG += no_private_qt_headers_warning CONFIG += no_private_qt_headers_warning
@ -39,6 +40,16 @@ CONFIG += hide_symbols
# CONFIG += debug # CONFIG += debug
# CONFIG += sanitize # CONFIG += sanitize
use_no_rpath {
CONFIG -= use_local_rpath use_install_rpath
} else {
cross_compile {
CONFIG *= use_install_rpath
} else {
!use_install_rpath: CONFIG *= use_local_rpath
}
}
MOC_DIR = moc MOC_DIR = moc
OBJECTS_DIR = obj OBJECTS_DIR = obj
RCC_DIR = rcc RCC_DIR = rcc
@ -169,4 +180,4 @@ debug {
# Help out Qt Creator # Help out Qt Creator
ide: DEFINES += QT_IDE ide: DEFINES += QT_IDE
# DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 # DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000

3
features/qskexample.prf
View File

@ -3,3 +3,6 @@ CONFIG += qskinny qsktestsupport
DEFINES += QSK_DLL DEFINES += QSK_DLL
DESTDIR = $$clean_path( $${OUT_PWD}/../bin ) DESTDIR = $$clean_path( $${OUT_PWD}/../bin )
target.path = $${QSK_INSTALL_EXAMPLES}/bin
INSTALLS = target

4
features/qskinny.prf
View File

@ -12,5 +12,7 @@ QSK_DIRS = \
INCLUDEPATH *= $${QSK_DIRS} INCLUDEPATH *= $${QSK_DIRS}
DEPENDPATH *= $${QSK_DIRS} DEPENDPATH *= $${QSK_DIRS}
QMAKE_RPATHDIR *= $${QSK_LIB_DIR} use_install_rpath: QMAKE_RPATHDIR *= $${QSK_INSTALL_LIBS}
use_local_rpath: QMAKE_RPATHDIR *= $${QSK_LIB_DIR}
qskAddLibrary( $${QSK_LIB_DIR}, qskinny ) qskAddLibrary( $${QSK_LIB_DIR}, qskinny )

4
features/qskqmlexport.prf
View File

@ -3,5 +3,7 @@ QSK_QML_EXPORT_DIRS = $${QSK_ROOT}/qmlexport
INCLUDEPATH *= $${QSK_QML_EXPORT_DIRS} INCLUDEPATH *= $${QSK_QML_EXPORT_DIRS}
DEPENDPATH *= $${QSK_QML_EXPORT_DIRS} DEPENDPATH *= $${QSK_QML_EXPORT_DIRS}
QMAKE_RPATHDIR *= $${QSK_LIB_DIR} use_install_rpath: QMAKE_RPATHDIR *= $${QSK_INSTALL_LIBS}
use_local_rpath: QMAKE_RPATHDIR *= $${QSK_LIB_DIR}
qskAddLibrary( $${QSK_LIB_DIR}, qskqmlexport) qskAddLibrary( $${QSK_LIB_DIR}, qskqmlexport)

4
features/qsktestsupport.prf
View File

@ -3,5 +3,7 @@ QSK_TEST_SUPPORT_DIRS = $${QSK_ROOT}/support
INCLUDEPATH *= $${QSK_TEST_SUPPORT_DIRS} INCLUDEPATH *= $${QSK_TEST_SUPPORT_DIRS}
DEPENDPATH *= $${QSK_TEST_SUPPORT_DIRS} DEPENDPATH *= $${QSK_TEST_SUPPORT_DIRS}
QMAKE_RPATHDIR *= $${QSK_LIB_DIR} use_install_rpath: QMAKE_RPATHDIR *= $${QSK_INSTALL_EXAMPLES}/lib
use_local_rpath: QMAKE_RPATHDIR *= $${QSK_LIB_DIR}
qskAddLibrary( $${QSK_LIB_DIR}, qsktestsupport) qskAddLibrary( $${QSK_LIB_DIR}, qsktestsupport)

7
support/support.pro
View File

@ -1,6 +1,9 @@
TEMPLATE = lib TEMPLATE = lib
TARGET = $$qskLibraryTarget(qsktestsupport) TARGET = $$qskLibraryTarget(qsktestsupport)
target.path = $${QSK_INSTALL_EXAMPLES}/lib
INSTALLS = target
CONFIG += ensure_skins CONFIG += ensure_skins
CONFIG += fontconfig CONFIG += fontconfig
CONFIG += qskinny CONFIG += qskinny
@ -33,7 +36,9 @@ ensure_skins {
DEFINES += ENSURE_SKINS DEFINES += ENSURE_SKINS
QMAKE_RPATHDIR *= $${QSK_PLUGIN_DIR}/skins use_install_rpath: QMAKE_RPATHDIR *= $${QSK_INSTALL_PLUGINS}/skins
use_local_rpath: QMAKE_RPATHDIR *= $${QSK_PLUGIN_DIR}/skins
qskAddLibrary($${QSK_PLUGIN_DIR}/skins, squiekskin) qskAddLibrary($${QSK_PLUGIN_DIR}/skins, squiekskin)
qskAddLibrary($${QSK_PLUGIN_DIR}/skins, materialskin) qskAddLibrary($${QSK_PLUGIN_DIR}/skins, materialskin)
} }