Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
4d7a0a2b
Commit
4d7a0a2b
authored
May 29, 2017
by
Martin Schultz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into feature_QOpenGLWidget
parents
9b675c0f
a2e93c36
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
cmake/ACGQt.cmake
cmake/ACGQt.cmake
+3
-0
No files found.
cmake/ACGQt.cmake
View file @
4d7a0a2b
...
...
@@ -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
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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