From bfd7a839dec42379ec058606965e967dbac16631 Mon Sep 17 00:00:00 2001 From: Elias Steurer Date: Sat, 18 Jan 2020 14:33:33 +0100 Subject: [PATCH] Fix install paths Add openSSL to readme as dep --- README.md | 1 + ScreenPlayWallpaper/ScreenPlayWallpaper.pro | 8 ++++---- ScreenPlayWidget/ScreenPlayWidget.pro | 4 ++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e785651e..fc347a6a 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ git clone https://gitlab.com/kelteseth/ScreenPlay.git * This will install these dependencies via __vcpkg__ * libzippp * nlohmann-json + * openSSL 1.1.1d * Download these dependencies via __git submodules__ * stomt-qt-sdk * qt-google-analytics diff --git a/ScreenPlayWallpaper/ScreenPlayWallpaper.pro b/ScreenPlayWallpaper/ScreenPlayWallpaper.pro index 2118b793..31650946 100644 --- a/ScreenPlayWallpaper/ScreenPlayWallpaper.pro +++ b/ScreenPlayWallpaper/ScreenPlayWallpaper.pro @@ -37,11 +37,13 @@ win32 { src/winwindow.h CONFIG(debug, debug|release) { + install_it.path = $${OUT_PWD}/debug/ install_it.files += \ $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libcrypto-1_1-x64.dll \ $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libssl-1_1-x64.dll \ } else { + install_it.path = $${OUT_PWD}/release/ install_it.files += \ $$PWD/../Common/vcpkg/installed/x64-windows/bin/libcrypto-1_1-x64.dll \ $$PWD/../Common/vcpkg/installed/x64-windows/bin/libssl-1_1-x64.dll \ @@ -73,12 +75,10 @@ macx { !macx { CONFIG(debug, debug|release) { - LIBS += -lScreenPlaySDKd - install_it.path = $${OUT_PWD}/debug/ + LIBS += -lScreenPlaySDKd QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/debug } else { - LIBS += -lScreenPlaySDK - install_it.path = $${OUT_PWD}/release/ + LIBS += -lScreenPlaySDK QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK/release } QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK diff --git a/ScreenPlayWidget/ScreenPlayWidget.pro b/ScreenPlayWidget/ScreenPlayWidget.pro index a25df358..fd332506 100644 --- a/ScreenPlayWidget/ScreenPlayWidget.pro +++ b/ScreenPlayWidget/ScreenPlayWidget.pro @@ -20,11 +20,13 @@ include(../ScreenPlaySDK/ScreenPlaySDK.pri) win32 { CONFIG(debug, debug|release) { + install_it.path = $${OUT_PWD}/debug/ install_it.files += \ $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libcrypto-1_1-x64.dll \ $$PWD/../Common/vcpkg/installed/x64-windows/debug/bin/libssl-1_1-x64.dll \ } else { + install_it.path = $${OUT_PWD}/release/ install_it.files += \ $$PWD/../Common/vcpkg/installed/x64-windows/bin/libcrypto-1_1-x64.dll \ $$PWD/../Common/vcpkg/installed/x64-windows/bin/libssl-1_1-x64.dll \ @@ -47,3 +49,5 @@ macx: { } QMAKE_LIBDIR += $$OUT_PWD/../ScreenPlaySDK } + +INSTALLS += install_it