From 72759345519799f05283a144869a9ecbefa7f227 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 28 Jun 2019 11:32:04 +0100 Subject: [PATCH] Add check in windows Qt project for PySide existence --- qrenderdoc/qrenderdoc.pro | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index df8ccff2b..6a337f96b 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -76,16 +76,18 @@ win32 { } # Include and link against PySide2 - DEFINES += PYSIDE2_ENABLED=1 - INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/shiboken2 - INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2 - INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2/QtCore - INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2/QtGui - INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2/QtWidgets - !contains(QMAKE_TARGET.arch, x86_64) { - LIBS += $$_PRO_FILE_PWD_/3rdparty/pyside/Win32/shiboken2.lib - } else { - LIBS += $$_PRO_FILE_PWD_/3rdparty/pyside/x64/shiboken2.lib + exists( $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2/pyside.h ) { + DEFINES += PYSIDE2_ENABLED=1 + INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/shiboken2 + INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2 + INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2/QtCore + INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2/QtGui + INCLUDEPATH += $$_PRO_FILE_PWD_/3rdparty/pyside/include/PySide2/QtWidgets + !contains(QMAKE_TARGET.arch, x86_64) { + LIBS += $$_PRO_FILE_PWD_/3rdparty/pyside/Win32/shiboken2.lib + } else { + LIBS += $$_PRO_FILE_PWD_/3rdparty/pyside/x64/shiboken2.lib + } } LIBS += user32.lib