summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
Diffstat (limited to 'doc')
-rw-r--r--doc/src/editors/creator-clang-codemodel.qdoc56
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