Skip to content
GitLab
Menu
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
b7e3cc68
Commit
b7e3cc68
authored
Dec 20, 2017
by
Jan Möbius
Browse files
Merge branch 'fix-cmake-qt5.10' into 'master'
cmake: fix qt version regex to work for qt 5.10 See merge request
!49
parents
7c10bc7d
c8a9a69e
Changes
1
Hide whitespace changes
Inline
Side-by-side
cmake/ACGQt.cmake
View file @
b7e3cc68
...
...
@@ -47,7 +47,7 @@ macro (acg_qt5)
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_MINOR
"
${
Qt5Core_VERSION_STRING
}
"
)
string
(
REGEX REPLACE
"^[0-9]+
\\
.[0-9]+
\\
.([0-9]+).*"
"
\\
1"
QT_VERSION_PATCH
"
${
Qt5Core_VERSION_STRING
}
"
)
find_package
(
Qt5Widgets QUIET PATHS
${
QT_DEFAULT_PATH
}
${
QT5_FINDER_FLAGS
}
)
...
...
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