diff options
| author | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2015-07-30 16:56:36 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> | 2015-07-31 11:21:13 +0000 |
| commit | 42335de928eb7eb85551dada0568034008ad6b9b (patch) | |
| tree | ff274abf001da8c553f4ebd5f39d2728b002ca8e | |
| parent | 892cb154b2a781e9056d6754f3d24a3912d9ca17 (diff) | |
| download | qt-creator-42335de928eb7eb85551dada0568034008ad6b9b.tar.gz | |
Doc: adding paths to CMake excutables
...and selecting them in kits.
Change-Id: I5093ec17593c6cdd67ab64abcbc5fca06b1c64ff
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
| -rw-r--r-- | doc/images/qtcreator-cmakeexecutable.png | bin | 6549 -> 10327 bytes | |||
| -rw-r--r-- | doc/images/qtcreator-kits.png | bin | 27905 -> 18015 bytes | |||
| -rw-r--r-- | doc/src/projects/creator-projects-cmake.qdoc | 18 | ||||
| -rw-r--r-- | doc/src/projects/creator-projects-targets.qdoc | 5 |
4 files changed, 18 insertions, 5 deletions
diff --git a/doc/images/qtcreator-cmakeexecutable.png b/doc/images/qtcreator-cmakeexecutable.png Binary files differindex b63fd2aeda..711c2f708c 100644 --- a/doc/images/qtcreator-cmakeexecutable.png +++ b/doc/images/qtcreator-cmakeexecutable.png diff --git a/doc/images/qtcreator-kits.png b/doc/images/qtcreator-kits.png Binary files differindex 15243c74a4..13bc784a76 100644 --- a/doc/images/qtcreator-kits.png +++ b/doc/images/qtcreator-kits.png diff --git a/doc/src/projects/creator-projects-cmake.qdoc b/doc/src/projects/creator-projects-cmake.qdoc index 80fbbddd91..4561f3f6b3 100644 --- a/doc/src/projects/creator-projects-cmake.qdoc +++ b/doc/src/projects/creator-projects-cmake.qdoc @@ -39,13 +39,20 @@ Since \QC 1.1, CMake configuration files are supported. Since \QC 1.3, the Microsoft tool chain is supported if the CMake version is at least 2.8. - \section1 Setting the Path for CMake + \QC automatically detects the CMake executable specified in the \c PATH. + You can add paths to other CMake executables and use them in different + build and run \l{glossary-buildandrun-kit}{kits}. - You can set the path for the CMake executable in \uicontrol Tools > - \uicontrol Options > \uicontrol {Build & Run} > \uicontrol CMake. + \section1 Adding CMake Tools + + To specify paths to CMake executables, select \uicontrol Tools > + \uicontrol Options > \uicontrol {Build & Run} > \uicontrol CMake > + \uicontrol Add. \image qtcreator-cmakeexecutable.png + \section1 Opening CMake Projects + \note Before you open a CMake project, you must modify the \c {PATH} environment variable to include the bin folders of \c mingw and Qt. @@ -60,8 +67,6 @@ C:\Qt\Tools\QtCreator\qtcreator.exe \endcode - \section1 Opening CMake Projects - To open a CMake project: \list 1 @@ -103,6 +108,9 @@ \QC supports multiple build configurations. You can change the build directory after the initial import. + The build and run kit that you select determines which CMake tool is used + for building. For more information, see \l {Adding Kits}. + \section1 Running CMake Projects \QC automatically adds \uicontrol {Run Configurations} for all targets diff --git a/doc/src/projects/creator-projects-targets.qdoc b/doc/src/projects/creator-projects-targets.qdoc index 4d0aec00c5..a9379ba6b9 100644 --- a/doc/src/projects/creator-projects-targets.qdoc +++ b/doc/src/projects/creator-projects-targets.qdoc @@ -114,6 +114,11 @@ configuration that should be used by qmake. If you leave this field empty, the default mkspec of the selected Qt version is used. + \li In the \uicontrol {CMake Tool} field, select the CMake tool to use + for building the project. Select \uicontrol Manage to add installed + CMake tools to the list. For more information, see + \l{Adding CMake Tools}. + \endlist */ |
