Merge branch 'master' into feature_QOpenGLWidget

4d7a0a2b · Martin Schultz · 9b675c0f · a2e93c36 · 4d7a0a2b
Commit 4d7a0a2b authored May 29, 2017 by Martin Schultz
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 0 deletions

cmake/ACGQt.cmake cmake/ACGQt.cmake +3 -0

No files found.
--- a/cmake/ACGQt.cmake
+++ b/cmake/ACGQt.cmake
@@ -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}")