Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-libclient
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-libclient
Commits
c3273b2f
Commit
c3273b2f
authored
4 years ago
by
Yang Wang
Committed by
Andreas Traczyk
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
make lrc: add contional call for setting up the qt msvc dir to work with qt 5.15
Change-Id: I48c1abf432587ad26a79b3052fdf6b999277e4f7
parent
8eae9277
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
make-lrc.py
+6
-1
6 additions, 1 deletion
make-lrc.py
with
6 additions
and
1 deletion
make-lrc.py
+
6
−
1
View file @
c3273b2f
...
...
@@ -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
'
,
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment