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
2d3b1f01
Commit
2d3b1f01
authored
4 years ago
by
Ming Rui Zhang
Committed by
Andreas Traczyk
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
cmake: make comparisons instead of match for qt versions
Change-Id: Iebef57d2ede318c6cd651cef697d286057aec6b9
parent
8cd7250d
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMakeLists.txt
+17
-10
17 additions, 10 deletions
CMakeLists.txt
with
17 additions
and
10 deletions
CMakeLists.txt
+
17
−
10
View file @
2d3b1f01
...
...
@@ -75,16 +75,23 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${LOCAL_CMAKE_MODULE_PATH})
FIND_PACKAGE
(
Ring REQUIRED
)
if
(
${
QT_MIN_VER
}
MATCHES
"5.14"
)
message
(
STATUS
"Using custom Qt version"
)
find_package
(
Qt5
${
QT_MIN_VER
}
REQUIRED
COMPONENTS Core DBus Sql Gui
PATHS
${
QT5_PATH
}
NO_DEFAULT_PATH
)
# Linguist tools is not required.
find_package
(
Qt5
${
QT_MIN_VER
}
COMPONENTS LinguistTools
PATHS
${
QT5_PATH
}
NO_DEFAULT_PATH
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH true
)
if
(
QT_MIN_VER
)
string
(
REPLACE
"."
";"
VERSION_LIST
${
QT_MIN_VER
}
)
list
(
GET VERSION_LIST 0 QT_MIN_VER_MAJOR
)
list
(
GET VERSION_LIST 1 QT_MIN_VER_MINOR
)
list
(
GET VERSION_LIST 2 QT_MIN_VER_PATCH
)
if
((
${
QT_MIN_VER_MAJOR
}
GREATER_EQUAL 5
)
AND
(
${
QT_MIN_VER_MINOR
}
GREATER_EQUAL 14
))
message
(
STATUS
"Using custom Qt version"
)
find_package
(
Qt5
${
QT_MIN_VER
}
REQUIRED
COMPONENTS Core DBus Sql Gui
PATHS
${
QT5_PATH
}
NO_DEFAULT_PATH
)
# Linguist tools is not required.
find_package
(
Qt5
${
QT_MIN_VER
}
COMPONENTS LinguistTools
PATHS
${
QT5_PATH
}
NO_DEFAULT_PATH
)
set
(
CMAKE_INSTALL_RPATH_USE_LINK_PATH true
)
endif
()
else
()
find_package
(
Qt5 REQUIRED
COMPONENTS Core DBus Sql Gui
)
...
...
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