Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
a2e93c36
Commit
a2e93c36
authored
May 26, 2017
by
Jan Möbius
Browse files
Merge branch 'featureCMakeFindQt59' into 'master'
fix to find Qt5.9 RC See merge request
!19
parents
71eef8d1
726612dc
Changes
1
Hide whitespace changes
Inline
Side-by-side
cmake/ACGQt.cmake
View file @
a2e93c36
...
...
@@ -32,6 +32,9 @@ macro (acg_qt5)
find_package
(
Qt5Core QUIET
)
if
(
Qt5Core_FOUND
)
if
(
Qt5Core_VERSION
)
# use the new version variable if it is set
set
(
Qt5Core_VERSION_STRING
${
Qt5Core_VERSION
}
)
endif
(
Qt5Core_VERSION
)
string
(
REGEX REPLACE
"^([0-9]+)
\\
.[0-9]+
\\
.[0-9]+.*"
"
\\
1"
QT_VERSION_MAJOR
"
${
Qt5Core_VERSION_STRING
}
"
)
string
(
REGEX REPLACE
"^[0-9]+
\\
.([0-9])+
\\
.[0-9]+.*"
"
\\
1"
QT_VERSION_MINOR
"
${
Qt5Core_VERSION_STRING
}
"
)
string
(
REGEX REPLACE
"^[0-9]+
\\
.[0-9]+
\\
.([0-9]+).*"
"
\\
1"
QT_VERSION_PATCH
"
${
Qt5Core_VERSION_STRING
}
"
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment