diff --git a/features/qskconfig.pri b/features/qskconfig.pri index 994b322d..e4dea99a 100644 --- a/features/qskconfig.pri +++ b/features/qskconfig.pri @@ -23,6 +23,7 @@ QSK_INSTALL_HEADERS = $${QSK_INSTALL_PREFIX}/include QSK_INSTALL_LIBS = $${QSK_INSTALL_PREFIX}/lib QSK_INSTALL_BINS = $${QSK_INSTALL_PREFIX}/bin QSK_INSTALL_PLUGINS = $${QSK_INSTALL_PREFIX}/plugins +QSK_INSTALL_EXAMPLES = $${QSK_INSTALL_PREFIX}/examples CONFIG += no_private_qt_headers_warning @@ -39,6 +40,16 @@ CONFIG += hide_symbols # CONFIG += debug # 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 OBJECTS_DIR = obj RCC_DIR = rcc @@ -169,4 +180,4 @@ debug { # Help out Qt Creator ide: DEFINES += QT_IDE -# DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x060000 +# DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000 diff --git a/features/qskexample.prf b/features/qskexample.prf index 4be67fb0..09e4f4e0 100644 --- a/features/qskexample.prf +++ b/features/qskexample.prf @@ -3,3 +3,6 @@ CONFIG += qskinny qsktestsupport DEFINES += QSK_DLL DESTDIR = $$clean_path( $${OUT_PWD}/../bin ) + +target.path = $${QSK_INSTALL_EXAMPLES}/bin +INSTALLS = target diff --git a/features/qskinny.prf b/features/qskinny.prf index 41e3ca4b..f306d67e 100644 --- a/features/qskinny.prf +++ b/features/qskinny.prf @@ -12,5 +12,7 @@ QSK_DIRS = \ INCLUDEPATH *= $${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 ) diff --git a/features/qskqmlexport.prf b/features/qskqmlexport.prf index 8b1b707e..c1fcf19b 100644 --- a/features/qskqmlexport.prf +++ b/features/qskqmlexport.prf @@ -3,5 +3,7 @@ QSK_QML_EXPORT_DIRS = $${QSK_ROOT}/qmlexport INCLUDEPATH *= $${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) diff --git a/features/qsktestsupport.prf b/features/qsktestsupport.prf index 9d03f232..9b2a239b 100644 --- a/features/qsktestsupport.prf +++ b/features/qsktestsupport.prf @@ -3,5 +3,7 @@ QSK_TEST_SUPPORT_DIRS = $${QSK_ROOT}/support INCLUDEPATH *= $${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) diff --git a/support/support.pro b/support/support.pro index f1315168..699b1f2b 100644 --- a/support/support.pro +++ b/support/support.pro @@ -1,6 +1,9 @@ TEMPLATE = lib TARGET = $$qskLibraryTarget(qsktestsupport) +target.path = $${QSK_INSTALL_EXAMPLES}/lib +INSTALLS = target + CONFIG += ensure_skins CONFIG += fontconfig CONFIG += qskinny @@ -33,7 +36,9 @@ 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, materialskin) }