diff --git a/examples/example.pri b/examples/example.pri index 9057d578..221f9952 100644 --- a/examples/example.pri +++ b/examples/example.pri @@ -1,5 +1,7 @@ QSK_ROOT = $${PWD}/.. + include( $${QSK_ROOT}/qskconfig.pri ) +include( $${QSK_ROOT}/qskfunctions.pri ) QSK_OUT_ROOT = $${OUT_PWD}/../.. @@ -23,7 +25,8 @@ DEPENDPATH *= $${QSK_DIRS} DESTDIR = $${QSK_OUT_ROOT}/examples/bin QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib -LIBS *= -L$${QSK_OUT_ROOT}/lib -lqsktestsupport -lqskinny +qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport) +qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) win32 { contains(QSK_CONFIG, QskDll) { diff --git a/inputcontext/inputcontext.pro b/inputcontext/inputcontext.pro index 7380ee8a..bb49b002 100644 --- a/inputcontext/inputcontext.pro +++ b/inputcontext/inputcontext.pro @@ -2,9 +2,10 @@ QSK_ROOT = $${PWD}/.. QSK_OUT_ROOT = $${OUT_PWD}/.. include( $${QSK_ROOT}/qskconfig.pri ) +include( $${QSK_ROOT}/qskfunctions.pri ) TEMPLATE = lib -TARGET = qskinputcontext +TARGET = $$qskLibraryTarget(qskinputcontext) QT += quick gui-private CONFIG += no_private_qt_headers_warning @@ -29,8 +30,7 @@ DEPENDPATH *= $${QSK_SUBDIRS} DESTDIR = $${QSK_OUT_ROOT}/plugins/platforminputcontexts -QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib -LIBS *= -L$${QSK_OUT_ROOT}/lib -lqskinny +qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) HEADERS += \ QskInputContextGlobal.h @@ -74,3 +74,7 @@ hunspell { contains(QSK_CONFIG, QskDll) { DEFINES += QT_DLL QSK_DLL QSK_INPUTCONTEXT_MAKEDLL } + +target.path = $${QSK_INSTALL_PLUGINS}/platforminputcontexts +INSTALLS = target + diff --git a/playground/playground.pri b/playground/playground.pri index a454e8d4..8e615476 100644 --- a/playground/playground.pri +++ b/playground/playground.pri @@ -1,5 +1,7 @@ QSK_ROOT = $${PWD}/.. + include( $${QSK_ROOT}/qskconfig.pri ) +include( $${QSK_ROOT}/qskfunctions.pri ) QSK_OUT_ROOT = $${OUT_PWD}/../.. @@ -25,7 +27,8 @@ DEPENDPATH += $${QSK_DIRS} DESTDIR = $${QSK_OUT_ROOT}/playground/bin QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib -LIBS *= -L$${QSK_OUT_ROOT}/lib -lqsktestsupport -lqskinny +qskAddLibrary($${QSK_OUT_ROOT}/lib, qsktestsupport) +qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) win32 { contains(QSK_CONFIG, QskDll) { diff --git a/playground/qmlplayground.pri b/playground/qmlplayground.pri index e4df7c05..37caba4d 100644 --- a/playground/qmlplayground.pri +++ b/playground/qmlplayground.pri @@ -3,5 +3,5 @@ QSK_ROOT = $${PWD}/.. INCLUDEPATH *= $${QSK_ROOT}/qmlexport DEPENDPATH *= $${QSK_ROOT}/qmlexport -LIBS *= -lqskqmlexport +qskAddLibrary($${QSK_OUT_ROOT}/lib, qskqmlexport) diff --git a/qmlexport/qmlexport.pro b/qmlexport/qmlexport.pro index 9c8d87f7..04d73ed5 100644 --- a/qmlexport/qmlexport.pro +++ b/qmlexport/qmlexport.pro @@ -2,12 +2,16 @@ QSK_ROOT = $${PWD}/.. QSK_OUT_ROOT = $${OUT_PWD}/.. include( $${QSK_ROOT}/qskconfig.pri ) +include( $${QSK_ROOT}/qskfunctions.pri ) TEMPLATE = lib -TARGET = qskqmlexport +TARGET = $$qskLibraryTarget(qskqmlexport) +VERSION = $${QSK_VERSION} DESTDIR = $${QSK_OUT_ROOT}/lib +qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) + QT += quick quick-private CONFIG += no_private_qt_headers_warning @@ -40,3 +44,5 @@ SOURCES += \ QskShortcut.cpp \ QskQml.cpp +target.path = $${QSK_INSTALL_LIBS} +INSTALLS = target diff --git a/qskconfig.pri b/qskconfig.pri index 9952b919..12af3098 100644 --- a/qskconfig.pri +++ b/qskconfig.pri @@ -1,3 +1,29 @@ +############################################################################ +# QSkinny - Copyright (C) 2016 Uwe Rathmann +# This file may be used under the terms of the QSkinny License, Version 1.0 +############################################################################ + +QSK_VER_MAJ = 0 +QSK_VER_MIN = 0 +QSK_VER_PAT = 0 +QSK_VERSION = $${QSK_VER_MAJ}.$${QSK_VER_MIN}.$${QSK_VER_PAT} + +QSK_INSTALL_PREFIX = $$[QT_INSTALL_PREFIX] + +unix { + QSK_INSTALL_PREFIX = /usr/local/qskinny-$${QSK_VERSION} +} + +win32 { + QSK_INSTALL_PREFIX = C:/Qskinny-$${QSK_VERSION} +} + +QSK_INSTALL_DOCS = $${QSK_INSTALL_PREFIX}/doc +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 + CONFIG += warn_on CONFIG += no_keywords CONFIG += silent diff --git a/qskinny.pro b/qskinny.pro index 4e536038..6bafa9bc 100644 --- a/qskinny.pro +++ b/qskinny.pro @@ -20,9 +20,9 @@ OTHER_FILES = \ doc/classes/*.metadox \ TODO +qmlexport.depends = src inputcontext.depends = src skins.depends = src -tools.depends = src -support.depends = skins +support.depends = src skins examples.depends = tools support skins qmlexport playground.depends = tools support skins qmlexport diff --git a/skins/skins.pri b/skins/skins.pri index 7043c834..afdb2514 100644 --- a/skins/skins.pri +++ b/skins/skins.pri @@ -1,5 +1,7 @@ QSK_ROOT = $${PWD}/.. + include( $${QSK_ROOT}/qskconfig.pri ) +include( $${QSK_ROOT}/qskfunctions.pri ) QSK_OUT_ROOT = $${OUT_PWD}/../.. @@ -8,6 +10,7 @@ CONFIG += plugin QT += quick TEMPLATE = lib +VERSION = $${QSK_VERSION} QSK_DIRS = \ $${QSK_ROOT}/src/common \ @@ -23,10 +26,11 @@ DEPENDPATH += $${QSK_DIRS} DESTDIR = $${QSK_OUT_ROOT}/plugins/skins -QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib -LIBS *= -L$${QSK_OUT_ROOT}/lib -lqskinny +qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) contains(QSK_CONFIG, QskDll) { DEFINES += QT_DLL QSK_DLL } +target.path = $${QSK_INSTALL_PLUGINS}/skins +INSTALLS = target diff --git a/src/src.pro b/src/src.pro index a4f338ca..f71a5239 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,14 +2,11 @@ QSK_ROOT = $${PWD}/.. QSK_OUT_ROOT = $${OUT_PWD}/.. include( $${QSK_ROOT}/qskconfig.pri ) +include( $${QSK_ROOT}/qskfunctions.pri ) TEMPLATE = lib -TARGET = qskinny - -QSK_VER_MAJ = 0 -QSK_VER_MIN = 0 -QSK_VER_PAT = 1 -QSK_VERSION = $${QSK_VER_MAJ}.$${QSK_VER_MIN}.$${QSK_VER_PAT} +TARGET = $$qskLibraryTarget(qskinny) +VERSION = $${QSK_VERSION} DESTDIR = $${QSK_OUT_ROOT}/lib @@ -315,3 +312,9 @@ SOURCES += \ inputpanel/QskInputPredictionBar.cpp \ inputpanel/QskVirtualKeyboard.cpp +target.path = $${QSK_INSTALL_LIBS} +INSTALLS = target + +header_files.files = $$HEADERS +header_files.path = $${QSK_INSTALL_HEADERS} +INSTALLS += header_files diff --git a/support/support.pro b/support/support.pro index d7e4114b..fe392f42 100644 --- a/support/support.pro +++ b/support/support.pro @@ -3,9 +3,10 @@ QSK_OUT_ROOT = $${OUT_PWD}/.. QSK_PLUGIN_DIR = $${QSK_OUT_ROOT}/plugins include( $${QSK_ROOT}/qskconfig.pri ) +include( $${QSK_ROOT}/qskfunctions.pri ) TEMPLATE = lib -TARGET = qsktestsupport +TARGET = $$qskLibraryTarget(qsktestsupport) DESTDIR = $${QSK_OUT_ROOT}/lib @@ -47,6 +48,8 @@ SOURCES += \ DEFINES += PLUGIN_PATH=$$clean_path( $$QSK_PLUGIN_DIR ) +qskAddLibrary($${QSK_OUT_ROOT}/lib, qskinny) + ensure_skins { # Enabling fall back code, that inserts some skin factories manually @@ -58,7 +61,8 @@ ensure_skins { DEFINES += ENSURE_SKINS QMAKE_RPATHDIR *= $${QSK_PLUGIN_DIR}/skins - LIBS *= -L$${QSK_PLUGIN_DIR}/skins -lsquiekskin -lmaterialskin + qskAddLibrary($${QSK_PLUGIN_DIR}/skins, squiekskin) + qskAddLibrary($${QSK_PLUGIN_DIR}/skins, materialskin) } fontconfig { diff --git a/tools/svg2qvg/svg2qvg.pro b/tools/svg2qvg/svg2qvg.pro index 09326311..756549d4 100644 --- a/tools/svg2qvg/svg2qvg.pro +++ b/tools/svg2qvg/svg2qvg.pro @@ -4,6 +4,7 @@ include( $${QSK_ROOT}/qskconfig.pri ) QSK_OUT_ROOT = $${OUT_PWD}/../.. TEMPLATE = app +TARGET = svg2qvg QT += svg @@ -28,7 +29,6 @@ standalone { } else { - QMAKE_RPATHDIR *= $${QSK_OUT_ROOT}/lib LIBS *= -L$${QSK_OUT_ROOT}/lib -lqskinny contains(QSK_CONFIG, QskDll) { @@ -36,7 +36,8 @@ else { } } -TARGET = svg2qvg - SOURCES += \ main.cpp + +target.path = $${QSK_INSTALL_BINS} +INSTALLS = target