feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Clang: Fix clang refactoring enabling

Browse Source 
Change-Id: Icdd539c4e537e5aab55943010055c9719dd622fe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Marco Bubke
2017-07-19 17:12:53 +02:00
committed by Tim Jenssen
parent 9523f1f899
commit d964df58a2
6 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clangpchmanager/clangpchmanager.pro
View File

@@ -3,6 +3,8 @@ include(clangpchmanager-source.pri)
include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_installation.pri)
include(../../shared/clang/clang_defines.pri) include(../../shared/clang/clang_defines.pri)
requires(!isEmpty(LIBTOOLING_LIBS))
HEADERS += \ HEADERS += \
$$PWD/clangpchmanagerplugin.h \ $$PWD/clangpchmanagerplugin.h \
qtcreatorprojectupdater.h qtcreatorprojectupdater.h

2
src/plugins/clangrefactoring/clangrefactoring.pro
View File

@@ -4,6 +4,8 @@ include(../../shared/clang/clang_installation.pri)
include(../../shared/clang/clang_defines.pri) include(../../shared/clang/clang_defines.pri)
requires(!isEmpty(LIBTOOLING_LIBS))
HEADERS += \ HEADERS += \
$$PWD/clangrefactoringplugin.h \ $$PWD/clangrefactoringplugin.h \
qtcreatorsearch.h \ qtcreatorsearch.h \

4
src/plugins/plugins.pro
View File

@@ -101,8 +101,8 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
exists($$LLVM_INSTALL_DIR) { exists($$LLVM_INSTALL_DIR) {
SUBDIRS += clangcodemodel SUBDIRS += clangcodemodel
LIBTOOLING_LIBS=$$(LIBTOOLING_LIBS) QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING)
!isEmpty(LIBTOOLING_LIBS) { isEmpty(QTC_NO_CLANG_LIBTOOLING) {
SUBDIRS += clangrefactoring SUBDIRS += clangrefactoring
SUBDIRS += clangpchmanager SUBDIRS += clangpchmanager
} else { } else {

2
src/tools/clangpchmanagerbackend/clangpchmanagerbackend.pro
View File

@@ -5,6 +5,8 @@ include(../../qtcreatortool.pri)
include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_installation.pri)
include(source/clangpchmanagerbackend-source.pri) include(source/clangpchmanagerbackend-source.pri)
requires(!isEmpty(LIBTOOLING_LIBS))
win32 { win32 {
LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines) LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines)
CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug")) CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug"))

2
src/tools/clangrefactoringbackend/clangrefactoringbackend.pro
View File

@@ -5,6 +5,8 @@ include(../../qtcreatortool.pri)
include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_installation.pri)
include(source/clangrefactoringbackend-source.pri) include(source/clangrefactoringbackend-source.pri)
requires(!isEmpty(LIBTOOLING_LIBS))
win32 { win32 {
LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines) LLVM_BUILDMODE = $$system($$llvm_config --build-mode, lines)
CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug")) CONFIG(debug, debug|release):requires(equals(LLVM_BUILDMODE, "Debug"))

4
src/tools/tools.pro
View File

@@ -24,8 +24,8 @@ isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
exists($$LLVM_INSTALL_DIR) { exists($$LLVM_INSTALL_DIR) {
SUBDIRS += clangbackend SUBDIRS += clangbackend
LIBTOOLING_LIBS=$$(LIBTOOLING_LIBS) QTC_NO_CLANG_LIBTOOLING=$$(QTC_NO_CLANG_LIBTOOLING)
!isEmpty(LIBTOOLING_LIBS) { isEmpty(QTC_NO_CLANG_LIBTOOLING) {
SUBDIRS += clangrefactoringbackend SUBDIRS += clangrefactoringbackend
SUBDIRS += clangpchmanagerbackend SUBDIRS += clangpchmanagerbackend
} else { } else {