diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-08-23 11:30:56 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-08-23 13:56:01 +0000 |
| commit | 4c9ef268176e7fe3df3bbfea7ee913a5bfde0ad0 (patch) | |
| tree | 618f1f77a4bde7d546c1c99a1e860f1179590543 /src | |
| parent | 9f7fe2fb8238b19ad6578b5759fd3f1bf8f13ded (diff) | |
| download | qt-creator-4c9ef268176e7fe3df3bbfea7ee913a5bfde0ad0.tar.gz | |
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>
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/clangsupport/CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/libs/clangsupport/CMakeLists.txt b/src/libs/clangsupport/CMakeLists.txt index 5357bd34c4..213dbeaadb 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 |