summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.cmake4
-rw-r--r--src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc6
2 files changed, 7 insertions, 3 deletions
diff --git a/configure.cmake b/configure.cmake
index 76ccac16a..e65dfc146 100644
--- a/configure.cmake
+++ b/configure.cmake
@@ -117,8 +117,10 @@ qt_configure_end_summary_section() # end of "Qt Tools" section
qt_configure_add_report_entry(
TYPE WARNING
MESSAGE "QDoc will not be compiled, probably because libclang could not be located. This means that you cannot build the Qt documentation.
-Either set CMAKE_PREFIX_PATH or LLVM_INSTALL_DIR to the location of your llvm installation.
+You may need to set CMAKE_PREFIX_PATH or LLVM_INSTALL_DIR to the location of your llvm installation.
On Linux systems, you may be able to install libclang by installing the libclang-dev or libclang-devel package, depending on your distribution.
+You may need to install another package, such as clang itself, to provide the ClangConfig.cmake file needed to detect your libclang. Once this
+file is in place, the configure script may be able to detect your system-installed libclang without further environment variables.
On macOS, you can use Homebrew's llvm package.
You will also need to set the FEATURE_clang CMake variable to ON to re-evaluate this check."
CONDITION NOT QT_FEATURE_clang
diff --git a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
index 3c3075ba6..086cf78ca 100644
--- a/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
+++ b/src/qdoc/doc/qdoc-guide/qdoc-guide.qdoc
@@ -663,6 +663,8 @@
cannot be used, as they miss certain components required by QDoc.
If you install Clang in a custom location you need to tell CMake where
- to find it. This can be done by adding the installation path to
- the \c CMAKE_PREFIX_PATH CMake cache variable.
+ to find it. This can be done by specifying your LLVM installation path
+ using the \c LLVM_INSTALL_DIR environment variable when configuring Qt.
+ Alternatively, you can add the installation path to the \c CMAKE_PREFIX_PATH
+ CMake cache variable.
*/