Skip to content

GitLab

Commit a2e93c36 authored by Jan Möbius's avatar Jan Möbius
Browse files

Merge branch 'featureCMakeFindQt59' into 'master' 

fix to find Qt5.9 RC

See merge request !19
parents 71eef8d1 726612dc
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
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}")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment