From cb3064a09e1052f0ad0dceddf25690fed5ab6eb4 Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Tue, 1 Nov 2016 14:44:49 +0100 Subject: [PATCH] Clang: use a pri file to set clang defines Change-Id: I52167ab3ce480c795cb0f0bcd749f97b34db86d3 Reviewed-by: Marco Bubke --- src/plugins/clangcodemodel/clangcodemodel.pro | 5 +---- src/plugins/clangrefactoring/clangrefactoring.pro | 3 +-- src/shared/clang/clang_defines.pri | 3 +++ tests/unit/unittest/creator_dependency.pri | 5 ++--- 4 files changed, 7 insertions(+), 9 deletions(-) create mode 100644 src/shared/clang/clang_defines.pri diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro index 0d9b5ee96b7..3ab1502d46e 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.pro +++ b/src/plugins/clangcodemodel/clangcodemodel.pro @@ -1,10 +1,7 @@ include(../../qtcreatorplugin.pri) include(../../shared/clang/clang_installation.pri) -# The following defines are used to determine the clang include path for intrinsics. -DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" -CLANG_RESOURCE_DIR=$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include) -DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${CLANG_RESOURCE_DIR}\\\"\"" +include(../../shared/clang/clang_defines.pri) SOURCES += \ clangactivationsequencecontextprocessor.cpp \ diff --git a/src/plugins/clangrefactoring/clangrefactoring.pro b/src/plugins/clangrefactoring/clangrefactoring.pro index 3716c86b937..b811f181a79 100644 --- a/src/plugins/clangrefactoring/clangrefactoring.pro +++ b/src/plugins/clangrefactoring/clangrefactoring.pro @@ -2,8 +2,7 @@ include(../../qtcreatorplugin.pri) include(clangrefactoring-source.pri) include(../../shared/clang/clang_installation.pri) -DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" -DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\"" +include(../../shared/clang/clang_defines.pri) HEADERS += \ $$PWD/clangrefactoringplugin.h diff --git a/src/shared/clang/clang_defines.pri b/src/shared/clang/clang_defines.pri new file mode 100644 index 00000000000..e1d219989f0 --- /dev/null +++ b/src/shared/clang/clang_defines.pri @@ -0,0 +1,3 @@ +DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" +CLANG_RESOURCE_DIR=$$clean_path($${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include) +DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${CLANG_RESOURCE_DIR}\\\"\"" diff --git a/tests/unit/unittest/creator_dependency.pri b/tests/unit/unittest/creator_dependency.pri index ef8101f2f9a..c2a35fccd9e 100644 --- a/tests/unit/unittest/creator_dependency.pri +++ b/tests/unit/unittest/creator_dependency.pri @@ -4,15 +4,14 @@ include($$PWD/../../../src/libs/clangbackendipc/clangbackendipc-lib.pri) include($$PWD/../../../src/plugins/coreplugin/corepluginunittestfiles.pri) !isEmpty(LLVM_INSTALL_DIR) { +include($$PWD/../../../src/shared/clang/clang_defines.pri) + include($$PWD/../../../src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri) include($$PWD/../../../src/tools/clangrefactoringbackend/source/clangrefactoringbackend-source.pri) include($$PWD/../../../src/plugins/clangcodemodel/clangcodemodelunittestfiles.pri) include($$PWD/../../../src/plugins/cpptools/cpptoolsunittestfiles.pri) include($$PWD/../../../src/plugins/clangrefactoring/clangrefactoring-source.pri) include(cplusplus.pri) - -DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" -DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\"" } DEFINES += QTC_REL_TOOLS_PATH=$$shell_quote(\"$$relative_path($$IDE_LIBEXEC_PATH, $$IDE_BIN_PATH)\")