From c3273b2fefe6c50f3c29454fa4e0c8265e9309bb Mon Sep 17 00:00:00 2001
From: Yang Wang <yang.wang@savoirfairelinux.com>
Date: Wed, 27 May 2020 18:09:59 -0400
Subject: [PATCH] make lrc: add contional call for setting up the qt msvc dir
to work with qt 5.15
Change-Id: I48c1abf432587ad26a79b3052fdf6b999277e4f7
---
make-lrc.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/make-lrc.py b/make-lrc.py
index d7b6c7ae..9f7dd205 100644
--- a/make-lrc.py
+++ b/make-lrc.py
@@ -132,7 +132,12 @@ def generate(force, qtver, sdk, toolset, arch):
# we just assume Qt is installed in the default folder
qt_dir = 'C:\\Qt\\' + qtver
cmake_gen = getCMakeGenerator(getLatestVSVersion())
- qt_cmake_dir = qt_dir + '\\msvc2017_64\\lib\\cmake\\'
+
+ qtFolderDir = "msvc2017_64"
+ qtverSplit = qtver.split('.')
+ if((int(qtverSplit[0]) >= 6) or((int(qtverSplit[0]) == 5) and (int(qtverSplit[1]) >= 15))):
+ qtFolderDir = "msvc2019_64"
+ qt_cmake_dir = qt_dir + '\\'+ qtFolderDir +'\\lib\\cmake\\'
cmake_options = [
'-DQt5Core_DIR=' + qt_cmake_dir + 'Qt5Core',
'-DQt5Sql_DIR=' + qt_cmake_dir + 'Qt5Sql',
--
GitLab