summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Smith <martin.smith@qt.io>2017-08-10 10:26:03 +0200
committerTopi Reiniö <topi.reinio@qt.io>2017-10-11 11:29:21 +0000
commit9dbdf0d1f6b9ebe732cdb24d1d2611d41bada1f0 (patch)
tree397a0c0e6c31b230b6797e1300104d1dfb498cb8
parent65d817345faf34cf9e5cc4f203b276de906fd84a (diff)
downloadqttools-9dbdf0d1f6b9ebe732cdb24d1d2611d41bada1f0.tar.gz
qdoc: Use correct variable to find libclang
This update changes CLANG__INSTALL_DIR to LLVM_INSTALL_DIR. Change-Id: Ie2b1dc41d06aa5dd2d82665f40c3e951c555a552 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
-rw-r--r--mkspecs/features/qt_find_clang.prf22
1 files changed, 11 insertions, 11 deletions
diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf
index 7e65d23fb..03a57f6a3 100644
--- a/mkspecs/features/qt_find_clang.prf
+++ b/mkspecs/features/qt_find_clang.prf
@@ -40,12 +40,12 @@ defineReplace(findLLVMVersionFromLibDir) {
}
for(_, $$list(_)) { # just a way to break easily
- isEmpty(CLANG_INSTALL_DIR): CLANG_INSTALL_DIR = $$(CLANG_INSTALL_DIR)
- CLANG_INSTALL_DIR = $$clean_path($$CLANG_INSTALL_DIR)
- clangInstallDir = $$CLANG_INSTALL_DIR
- isEmpty(CLANG_INSTALL_DIR) {
+ isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR)
+ LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR)
+ clangInstallDir = $$LLVM_INSTALL_DIR
+ isEmpty(LLVM_INSTALL_DIR) {
win32 {
- log("Set the CLANG_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)")
+ log("Set the LLVM_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)")
break()
}
clangInstallDir = /usr
@@ -64,17 +64,17 @@ for(_, $$list(_)) { # just a way to break easily
CLANG_VERSION = $$findLLVMVersionFromLibDir($$CLANG_LIBDIR)
}
isEmpty(CLANG_VERSION) {
- !isEmpty(CLANG_INSTALL_DIR): \
- error("Cannot determine clang version at $${CLANG_INSTALL_DIR}.")
- log("Set the CLANG_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)")
+ !isEmpty(LLVM_INSTALL_DIR): \
+ error("Cannot determine clang version at $${LLVM_INSTALL_DIR}.")
+ log("Set the LLVM_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)")
break()
}
LIBCLANG_MAIN_HEADER = $$CLANG_INCLUDEPATH/clang-c/Index.h
!exists($$LIBCLANG_MAIN_HEADER) {
- !isEmpty(CLANG_INSTALL_DIR): \
+ !isEmpty(LLVM_INSTALL_DIR): \
error("Cannot find libclang's main header file, candidate: $${LIBCLANG_MAIN_HEADER}.")
- log("Set the CLANG_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)")
+ log("Set the LLVM_INSTALL_DIR environment variable to configure clang location.$$escape_expand(\\n)")
break()
}
@@ -86,7 +86,7 @@ for(_, $$list(_)) { # just a way to break easily
!versionIsAtLeast($$CLANG_VERSION, "3.9.0") {
log("LLVM/Clang version >= 3.9.0 required, version provided: $$CLANG_VERSION.$$escape_expand(\\n)")
- log("Clang was found in $$CLANG_INSTALL_DIR. Set the CLANG_INSTALL_DIR environment variable to override.$$escape_expand(\\n)")
+ log("Clang was found in $$LLVM_INSTALL_DIR. Set the LLVM_INSTALL_DIR environment variable to override.$$escape_expand(\\n)")
break()
}