diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-29 09:37:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-29 09:37:44 (GMT) |
| commit | 9978889c569094ce6d60137ac137b74c6447eb63 (patch) | |
| tree | 994136eb51f6bab7f85df1f75e7f98dc18f5d5ef | |
| parent | cf2f4406586f4ee0b90cecc26352451ca5a124f7 (diff) | |
| parent | 0aea38d25e5bbfa2e8d01ddd0516f244fc2ac5eb (diff) | |
| download | CMake-9978889c569094ce6d60137ac137b74c6447eb63.zip CMake-9978889c569094ce6d60137ac137b74c6447eb63.tar.gz CMake-9978889c569094ce6d60137ac137b74c6447eb63.tar.bz2 | |
Merge topic 'user-interaction-images'
0aea38d25e Help: Change User Interaction image paths to be relative to source file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5279
| -rw-r--r-- | Help/guide/user-interaction/VS-Choose-Arch.png (renamed from Help/manual/VS-Choose-Arch.png) | bin | 11130 -> 11130 bytes | |||
| -rw-r--r-- | Help/guide/user-interaction/index.rst | 10 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Help/manual/VS-Choose-Arch.png b/Help/guide/user-interaction/VS-Choose-Arch.png Binary files differindex 816b0f4..816b0f4 100644 --- a/Help/manual/VS-Choose-Arch.png +++ b/Help/guide/user-interaction/VS-Choose-Arch.png diff --git a/Help/guide/user-interaction/index.rst b/Help/guide/user-interaction/index.rst index c724b6f..2d8ed29 100644 --- a/Help/guide/user-interaction/index.rst +++ b/Help/guide/user-interaction/index.rst @@ -85,7 +85,7 @@ The source and binary directories must first be populated. It is always advised to use different directories for the source and the build. -.. image:: /guide/user-interaction/GUI-Source-Binary.png +.. image:: GUI-Source-Binary.png :alt: Choosing source and binary directories Generating a Buildsystem @@ -246,19 +246,19 @@ Choosing a generator in cmake-gui The "Configure" button triggers a new dialog to select the CMake generator to use. -.. image:: /guide/user-interaction/GUI-Configure-Dialog.png +.. image:: GUI-Configure-Dialog.png :alt: Configuring a generator All generators available on the command line are also available in :manual:`cmake-gui(1)`. -.. image:: /guide/user-interaction/GUI-Choose-Generator.png +.. image:: GUI-Choose-Generator.png :alt: Choosing a generator When choosing a Visual Studio generator, further options are available to set an architecture to generate for. -.. image:: /manual/VS-Choose-Arch.png +.. image:: VS-Choose-Arch.png :alt: Choosing an architecture for Visual Studio generators .. _`Setting Build Variables`: @@ -359,7 +359,7 @@ Variables may be set in the cmake-gui using the "Add Entry" button. This triggers a new dialog to set the value of the variable. -.. image:: /guide/user-interaction/GUI-Add-Entry.png +.. image:: GUI-Add-Entry.png :alt: Editing a cache entry The main view of the :manual:`cmake-gui(1)` user interface |
