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

Codemodelbackend: Check properly for LLVM_INSTALL_DIR

Browse Source 
* Check also the environment variable
* Check before including clang_installation.pri
* Move the check to src/tools.pro to be consistent with the rest

Change-Id: I0ffc43b5cc8df49fdc6141d356e34de22041eabb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Nikolai Kosjar
2015-06-04 12:27:46 +02:00
parent be6293063a
commit 5375e6a10e
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/tools/codemodelbackend/codemodelbackend.pri
View File

@@ -11,8 +11,6 @@ include(ipcsource/codemodelbackendclangipc-source.pri)
include(../../../qtcreator.pri) include(../../../qtcreator.pri)
include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_installation.pri)
requires(!isEmpty(LLVM_INSTALL_DIR))
LIBS += -L$$OUT_PWD/../codemodelbackendipc/lib/qtcreator -lCodemodelbackendipc -lSqlite LIBS += -L$$OUT_PWD/../codemodelbackendipc/lib/qtcreator -lCodemodelbackendipc -lSqlite
LIBS += $$LLVM_LIBS LIBS += $$LLVM_LIBS
INCLUDEPATH += $$LLVM_INCLUDEPATH INCLUDEPATH += $$LLVM_INCLUDEPATH

8
src/tools/tools.pro
View File

@@ -6,8 +6,7 @@ SUBDIRS = qtpromaker \
valgrindfake \ valgrindfake \
3rdparty \ 3rdparty \
qml2puppet \ qml2puppet \
buildoutputparser \ buildoutputparser
codemodelbackend
win32 { win32 {
SUBDIRS += qtcdebugger \ SUBDIRS += qtcdebugger \
@@ -19,6 +18,11 @@ mac {
SUBDIRS += iostool SUBDIRS += iostool
} }
isEmpty(LLVM_INSTALL_DIR):LLVM_INSTALL_DIR=$$(LLVM_INSTALL_DIR)
!isEmpty(LLVM_INSTALL_DIR) {
SUBDIRS += codemodelbackend
}
BUILD_CPLUSPLUS_TOOLS = $$(BUILD_CPLUSPLUS_TOOLS) BUILD_CPLUSPLUS_TOOLS = $$(BUILD_CPLUSPLUS_TOOLS)
!isEmpty(BUILD_CPLUSPLUS_TOOLS) { !isEmpty(BUILD_CPLUSPLUS_TOOLS) {
SUBDIRS += cplusplus-ast2png \ SUBDIRS += cplusplus-ast2png \