From 4c9ef268176e7fe3df3bbfea7ee913a5bfde0ad0 Mon Sep 17 00:00:00 2001
From: Nikolai Kosjar <nikolai.kosjar@qt.io>
Date: Fri, 23 Aug 2019 11:30:56 +0200
Subject: [PATCH] Clang: Fix clang installation macros

LLVMConfig.cmake (version 8 at least) does not set

  CLANG_VERSION
  CLANG_RESOURCE_DIR
  CLANG_BINDIR

Task-number: QTCREATORBUG-22825
Change-Id: I83de1b73fd777df1ee980cb3189fd3be2e4a9f3b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/clangsupport/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt
index 5357bd34c4c..213dbeaadb9 100644
--- a/src/libs/clangsupport/CMakeLists.txt
+++ b/src/libs/clangsupport/CMakeLists.txt
@@ -1,9 +1,11 @@
+set(CLANG_VERSION ${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}.${LLVM_VERSION_PATCH})
+
 add_qtc_library(ClangSupport
   PUBLIC_DEPENDS Utils Sqlite Qt5::Core Qt5::Network
   PUBLIC_DEFINES
     CLANG_VERSION="${CLANG_VERSION}"
-    CLANG_RESOURCE_DIR="${CLANG_RESOURCE_DIR}"
-    CLANG_BINDIR="${CLANG_BIN_DIR}"
+    CLANG_RESOURCE_DIR="${LLVM_LIBRARY_DIR}/clang/${CLANG_VERSION}/include"
+    CLANG_BINDIR="${LLVM_TOOLS_BINARY_DIR}"
   DEFINES CLANGSUPPORT_BUILD_LIB
   SOURCES
     alivemessage.cpp alivemessage.h