diff options
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/dev/source.rst | 15 | ||||
| -rw-r--r-- | Help/guide/user-interaction/index.rst | 5 | ||||
| -rw-r--r-- | Help/prop_tgt/INSTALL_RPATH.rst | 4 |
3 files changed, 24 insertions, 0 deletions
diff --git a/Help/dev/source.rst b/Help/dev/source.rst index 65a6adf..0ccb8f4 100644 --- a/Help/dev/source.rst +++ b/Help/dev/source.rst @@ -163,6 +163,18 @@ It is allowed to pass raw pointers between objects to enable objects sharing. A raw pointer **must** not be deleted. Only the object(s) owning the smart pointer are allowed to delete dynamically allocated memory. +Third Parties +============= + +To build CMake, some third parties are needed. Under ``Utilities`` +directory, are versions of these third parties which can be used as an +alternate to the ones provided by the system. + +To enable the selection of the third parties between the system and CMake ones, +in CMake sources, third parties headers must be prefixed by ``cm3p/`` +(for example: ``<cm3p/json/reader.h>``). These wrappers are located under +``Utilities/cm3p`` directory. + Source Tree Layout ================== @@ -208,6 +220,9 @@ The CMake source tree is organized as follows. * ``Utilities/std/cmext``: Extensions to the C++ STL. + * ``Utilities/cm3p``: + Public headers for third parties needed to build CMake. + * ``Utilities/Sphinx/``: Sphinx configuration to build CMake user documentation. diff --git a/Help/guide/user-interaction/index.rst b/Help/guide/user-interaction/index.rst index 3a1038f..c724b6f 100644 --- a/Help/guide/user-interaction/index.rst +++ b/Help/guide/user-interaction/index.rst @@ -86,6 +86,7 @@ populated. It is always advised to use different directories for the source and the build. .. image:: /guide/user-interaction/GUI-Source-Binary.png + :alt: Choosing source and binary directories Generating a Buildsystem ======================== @@ -246,16 +247,19 @@ The "Configure" button triggers a new dialog to select the CMake generator to use. .. image:: /guide/user-interaction/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 + :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 + :alt: Choosing an architecture for Visual Studio generators .. _`Setting Build Variables`: @@ -356,6 +360,7 @@ button. This triggers a new dialog to set the value of the variable. .. image:: /guide/user-interaction/GUI-Add-Entry.png + :alt: Editing a cache entry The main view of the :manual:`cmake-gui(1)` user interface can be used to edit existing variables. diff --git a/Help/prop_tgt/INSTALL_RPATH.rst b/Help/prop_tgt/INSTALL_RPATH.rst index 93b4488..4549b92 100644 --- a/Help/prop_tgt/INSTALL_RPATH.rst +++ b/Help/prop_tgt/INSTALL_RPATH.rst @@ -8,5 +8,9 @@ targets (for platforms that support it). This property is initialized by the value of the variable :variable:`CMAKE_INSTALL_RPATH` if it is set when a target is created. +Because the rpath may contain ``${ORIGIN}``, which coincides with CMake syntax, +the contents of ``INSTALL_RPATH`` are properly escaped in the +``cmake_install.cmake`` script (see policy :policy:`CMP0095`.) + This property supports :manual:`generator expressions <cmake-generator-expressions(7)>`. |