diff --git a/cmake/modules/FindClang.cmake b/cmake/modules/FindClang.cmake
index 53dbcfd8cb..78203fbf92 100644
--- a/cmake/modules/FindClang.cmake
+++ b/cmake/modules/FindClang.cmake
@@ -1,118 +1,119 @@
 # Detect Clang libraries
 #
 # Defines the following variables:
 #  CLANG_FOUND                 - True if Clang was found
 #  CLANG_INCLUDE_DIRS          - Where to find Clang includes
 #  CLANG_LIBRARY_DIRS          - Where to find Clang libraries
 #
 #  CLANG_LIBCLANG_LIB          - Libclang C library
 #
 #  CLANG_CLANGFRONTEND_LIB     - Clang Frontend (C++) Library
 #  CLANG_CLANGDRIVER_LIB       - Clang Driver (C++) Library
 #  ...
 #
 #  CLANG_LIBS                  - All the Clang C++ libraries
 #
 # Uses the same include and library paths detected by FindLLVM.cmake
 #
 # See http://clang.llvm.org/docs/InternalsManual.html for full list of libraries
 
 #=============================================================================
 # Copyright 2014-2015 Kevin Funk <kfunk@kde.org>
 #
 # Distributed under the OSI-approved BSD License (the "License");
 # see accompanying file Copyright.txt for details.
 #
 # This software is distributed WITHOUT ANY WARRANTY; without even the
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 # See the License for more information.
 
 #=============================================================================
 
 set(KNOWN_VERSIONS 6.0 5.0 4.0 3.9 3.8)
 
 foreach(version ${KNOWN_VERSIONS})
     if (LLVM_DIR OR (DEFINED Clang_FIND_VERSION AND Clang_FIND_VERSION VERSION_GREATER version))
         break()
     endif ()
 
     if (${Clang_FIND_REQUIRED})
         find_package(LLVM ${version} REQUIRED)
     else ()
         find_package(LLVM ${version})
     endif ()
 endforeach()
 
 set(CLANG_FOUND FALSE)
 
 if (LLVM_FOUND AND LLVM_LIBRARY_DIRS)
   macro(FIND_AND_ADD_CLANG_LIB _libname_)
     string(TOUPPER ${_libname_} _prettylibname_)
     find_library(CLANG_${_prettylibname_}_LIB NAMES ${_libname_} HINTS ${LLVM_LIBRARY_DIRS})
     if(CLANG_${_prettylibname_}_LIB)
       set(CLANG_LIBS ${CLANG_LIBS} ${CLANG_${_prettylibname_}_LIB})
     endif()
   endmacro(FIND_AND_ADD_CLANG_LIB)
 
   # note: On Windows there's 'libclang.dll' instead of 'clang.dll' -> search for 'libclang', too
   find_library(CLANG_LIBCLANG_LIB NAMES clang libclang HINTS ${LLVM_LIBRARY_DIRS}) # LibClang: high-level C interface
 
   FIND_AND_ADD_CLANG_LIB(clangFrontend)
   FIND_AND_ADD_CLANG_LIB(clangDriver)
   FIND_AND_ADD_CLANG_LIB(clangCodeGen)
   FIND_AND_ADD_CLANG_LIB(clangSema)
   FIND_AND_ADD_CLANG_LIB(clangChecker)
   FIND_AND_ADD_CLANG_LIB(clangAnalysis)
   FIND_AND_ADD_CLANG_LIB(clangRewriteFrontend)
   FIND_AND_ADD_CLANG_LIB(clangRewrite)
   FIND_AND_ADD_CLANG_LIB(clangAST)
   FIND_AND_ADD_CLANG_LIB(clangParse)
   FIND_AND_ADD_CLANG_LIB(clangLex)
   FIND_AND_ADD_CLANG_LIB(clangBasic)
   FIND_AND_ADD_CLANG_LIB(clangARCMigrate)
   FIND_AND_ADD_CLANG_LIB(clangEdit)
   FIND_AND_ADD_CLANG_LIB(clangFrontendTool)
   FIND_AND_ADD_CLANG_LIB(clangRewrite)
   FIND_AND_ADD_CLANG_LIB(clangSerialization)
   FIND_AND_ADD_CLANG_LIB(clangTooling)
   FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCheckers)
   FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerCore)
   FIND_AND_ADD_CLANG_LIB(clangStaticAnalyzerFrontend)
   FIND_AND_ADD_CLANG_LIB(clangSema)
   FIND_AND_ADD_CLANG_LIB(clangRewriteCore)
 endif()
 
 if(CLANG_LIBS OR CLANG_LIBCLANG_LIB)
   set(CLANG_FOUND TRUE)
 else()
   message(STATUS "Could not find any Clang libraries in ${LLVM_LIBRARY_DIRS}")
 endif()
 
 if(CLANG_FOUND)
   set(CLANG_LIBRARY_DIRS ${LLVM_LIBRARY_DIRS})
   set(CLANG_INCLUDE_DIRS ${LLVM_INCLUDE_DIRS})
+  set(CLANG_VERSION ${LLVM_VERSION})
 
   # check whether llvm-config comes from an install prefix
   execute_process(
     COMMAND ${LLVM_CONFIG_EXECUTABLE} --src-root
     OUTPUT_VARIABLE _llvmSourceRoot
     OUTPUT_STRIP_TRAILING_WHITESPACE
   )
   string(FIND "${LLVM_INCLUDE_DIRS}" "${_llvmSourceRoot}" _llvmIsInstalled)
   if (NOT _llvmIsInstalled)
     message(STATUS "Detected that llvm-config comes from a build-tree, adding more include directories for Clang")
     list(APPEND CLANG_INCLUDE_DIRS
          "${LLVM_INSTALL_PREFIX}/tools/clang/include" # build dir
          "${_llvmSourceRoot}/tools/clang/include"     # source dir
     )
   endif()
 
-  message(STATUS "Found Clang (LLVM version: ${LLVM_VERSION})")
+  message(STATUS "Found Clang (LLVM version: ${CLANG_VERSION})")
   message(STATUS "  Include dirs:       ${CLANG_INCLUDE_DIRS}")
   message(STATUS "  Clang libraries:    ${CLANG_LIBS}")
   message(STATUS "  Libclang C library: ${CLANG_LIBCLANG_LIB}")
 else()
   if(Clang_FIND_REQUIRED)
     message(FATAL_ERROR "Could NOT find Clang")
   endif()
 endif()