diff options
author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-08-05 16:10:42 +0200 |
---|---|---|
committer | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-08-06 12:43:20 +0000 |
commit | 6b99b1c7cba3f522e3df619eef060e3c96bfb32e (patch) | |
tree | aab1c58b5bd0994e9128fc3ace025ad0b52ec632 /doc | |
parent | fe09dee7c36f766d4fc7c08193de6893c5b6c53d (diff) | |
download | qt-creator-6b99b1c7cba3f522e3df619eef060e3c96bfb32e.tar.gz |
Doc: update information about Clang Code Model Plugin II
* Update the instructions on building clang.
* State the minimum version of clang that is necessary (3.6.2).
* Rearrange the "acquire clang entries", the least time-consuming method
for acquiring clang comes first now.
Change-Id: Ie0a80fa507be20fd7c3f09930de03a88634cccce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/src/editors/creator-clang-codemodel.qdoc | 56 |
1 files changed, 16 insertions, 40 deletions
diff --git a/doc/src/editors/creator-clang-codemodel.qdoc b/doc/src/editors/creator-clang-codemodel.qdoc index 5effcc6458..fedc299804 100644 --- a/doc/src/editors/creator-clang-codemodel.qdoc +++ b/doc/src/editors/creator-clang-codemodel.qdoc @@ -96,35 +96,30 @@ \list 1 - \li To build the Clang code model plugin, you must acquire Clang and - LLVM in one of the following ways: + \li Acquire Clang 3.6.0 or higher in one of the following ways: \list - \li Build optimized versions of LLVM and Clang, as instructed in - \l{http://clang.llvm.org/get_started.html} - {Getting Started: Building and Running Clang}. - - The instructions describe how to build debug versions. To - build optimized versions, enter the following command - instead of just \c make: + \li Use the package manager of your system. - \c{make ENABLE_OPTIMIZED=1} + \li Download and install LLVM from the + \l{http://llvm.org/releases/}{LLVM Download Page} or + \l{http://llvm.org/builds/}{LLVM Snapshot Builds}. - For information about Git mirrors, see - \l{http://llvm.org/docs/GettingStarted.html#git-mirror} - {Git Mirror}. + \li Build Clang by following + \l{http://clang.llvm.org/get_started.html} + {Getting Started: Building and Running Clang}. - Install the built versions by entering the following - command: + Add the following options to the \c cmake call in order to + build an optimized version and to specify the installation + directory: - \c{make install} + \c -DCMAKE_BUILD_TYPE=Release + \c -DCMAKE_INSTALL_PREFIX=/your/install/dir - \li Download and install LLVM from the - \l{http://llvm.org/releases/}{LLVM Download Page} or - \l{http://llvm.org/builds/}{LLVM Snapshot Builds}. + After building, install with - \li Use the package manager of your system. + \c {make install} \endlist @@ -132,26 +127,7 @@ of LLVM either as part of the build environment or pass it directly to qmake when you build \QC. - The following are examples of the LLVM_INSTALL_DIR values to use - depending on the installation method: - - \list - - \li Installed via package manager on Linux: - - \c {LLVM_INSTALL_DIR=/usr/lib/llvm-3.6} - - \li Manually built on Unix in release mode: - - \c {LLVM_INSTALL_DIR=$HOME/llvm-build/Release+Asserts} - - \li Installed from a snapshot on Windows: - - \c {LLVM_INSTALL_DIR=C:\llvm} - - \endlist - - \li Rebuild \QC. + \li Rerun \c qmake and build \QC. \endlist |