From: APTX Date: Sun, 5 Mar 2017 15:50:13 +0000 (+0100) Subject: Redo file installation X-Git-Url: https://gitweb.aptx.org/?a=commitdiff_plain;h=8b6dc70e3723df09de6765678f387c61402472e9;p=aniplayer.git Redo file installation Installation is now defined on windows. On windows everything is installed into PREFIX/aniplayer. PREFIX is set to %PROGRAMFILES% should be the default installation path on windows. API headers are also installed to allow for out-of-tree plugins. --- diff --git a/backendplugins/backend_mpv/backend_mpv.pro b/backendplugins/backend_mpv/backend_mpv.pro index abb75be..3cda547 100644 --- a/backendplugins/backend_mpv/backend_mpv.pro +++ b/backendplugins/backend_mpv/backend_mpv.pro @@ -28,3 +28,8 @@ unix { INSTALLS += target } +win32:INSTALL_DESTINATION = aniplayer/backendplugins +unix:INSTALL_DESTINATION = lib/aniplayer/backendplugins + +target.path = $${PREFIX}/$${INSTALL_DESTINATION} +INSTALLS += target diff --git a/backendplugins/backend_null/backend_null.pro b/backendplugins/backend_null/backend_null.pro index 6de835b..1948d17 100644 --- a/backendplugins/backend_null/backend_null.pro +++ b/backendplugins/backend_null/backend_null.pro @@ -15,7 +15,8 @@ HEADERS += backendnull.h\ DISTFILES += \ backend_null.json -unix { - target.path = $${PREFIX}/lib/aniplayer/backendplugins - INSTALLS += target -} +win32:INSTALL_DESTINATION = aniplayer/backendplugins +unix:INSTALL_DESTINATION = lib/aniplayer/backendplugins + +target.path = $${PREFIX}/$${INSTALL_DESTINATION} +INSTALLS += target diff --git a/core/core.pro b/core/core.pro index 37cc4a2..30ca62d 100644 --- a/core/core.pro +++ b/core/core.pro @@ -29,7 +29,17 @@ win32 { RC_FILE += aniplayer.rc } +win32 { + INSTALL_DESTINATION = aniplayer + HEADERS_DESTINATION = $$INSTALL_DESTINATION/include/aniplayer +} unix { - target.path = $${PREFIX}/bin - INSTALLS += target + INSTALL_DESTINATION = bin + HEADERS_DESTINATION = include/aniplayer } + +target.path = $${PREFIX}/$${INSTALL_DESTINATION} +api_headers.files = $$find(HEADERS, "^include/") +api_headers.path = $${PREFIX}/$${HEADERS_DESTINATION} + +INSTALLS += target api_headers diff --git a/featureplugins/feature_localmylist/feature_localmylist.pro b/featureplugins/feature_localmylist/feature_localmylist.pro index 289194d..8a7cedd 100644 --- a/featureplugins/feature_localmylist/feature_localmylist.pro +++ b/featureplugins/feature_localmylist/feature_localmylist.pro @@ -17,7 +17,8 @@ DISTFILES += feature_localmylist.json LIBS += -llocalmylist -unix { - target.path = $${PREFIX}/lib/aniplayer/featureplugins - INSTALLS += target -} +win32:INSTALL_DESTINATION = aniplayer/featureplugins +unix:INSTALL_DESTINATION = lib/aniplayer/featureplugins + +target.path = $${PREFIX}/$${INSTALL_DESTINATION} +INSTALLS += target diff --git a/uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro b/uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro index 85c1769..13337c2 100644 --- a/uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro +++ b/uiplugins/ui_desktop_qml_default/ui_desktop_qml_default.pro @@ -20,7 +20,8 @@ RESOURCES += qml.qrc DISTFILES += ui_desktop_qml_default.json -unix { - target.path = $${PREFIX}/lib/aniplayer/uiplugins - INSTALLS += target -} +win32:INSTALL_DESTINATION = aniplayer/uiplugins +unix:INSTALL_DESTINATION = lib/aniplayer/uiplugins + +target.path = $${PREFIX}/$${INSTALL_DESTINATION} +INSTALLS += target