[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5986-gb10fcf7

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b10fcf75a29beffa9daf30f10ab2efe1d2113e26 (commit)
       via  f0a32de64e8126561ef9568329033e1a754e5163 (commit)
      from  a5dbfa92adc498bd3df58bb68a5b6aa72c2453ec (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b10fcf75a29beffa9daf30f10ab2efe1d2113e26
commit b10fcf75a29beffa9daf30f10ab2efe1d2113e26
Merge: a5dbfa9 f0a32de
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Dec 3 07:44:38 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Dec 3 07:44:38 2013 -0500

    Merge topic 'cmake-toolchains-manual' into next
    
    f0a32de Minor fixes to toolchains docs.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f0a32de64e8126561ef9568329033e1a754e5163
commit f0a32de64e8126561ef9568329033e1a754e5163
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Dec 3 13:43:02 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Dec 3 13:43:02 2013 +0100

    Minor fixes to toolchains docs.

diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst
index 48c0433..fbe546e 100644
--- a/Help/manual/cmake-toolchains.7.rst
+++ b/Help/manual/cmake-toolchains.7.rst
@@ -44,22 +44,14 @@ etc.
 The :prop_gbl:`ENABLED_LANGUAGES` global property contains the languages which
 are currently enabled.
 
-Variables and properties
+Variables and Properties
 ========================
 
 Several variables relate to the language components of a toolchain which are
-enabled. :variable:`CMAKE_<LANG>_COMPILER_LOADED` variables can be tested to
-check if a compiler for a particular language is loaded.
-
-:variable:`CMAKE_<LANG>_COMPILER` is the full path to the compiler used
+enabled. :variable:`CMAKE_<LANG>_COMPILER` is the full path to the compiler used
 for ``<LANG>``. :variable:`CMAKE_<LANG>_COMPILER_ID` is the identifier used
 by CMake for the compiler and :variable:`CMAKE_<LANG>_COMPILER_VERSION` is the
-version of the compiler. It is common for one compiler to have a mode of
-behaving like another compiler. For example, the Intel compiler may behave as
-either the MSVC compiler or the GNU compiler, depending on the platform and the
-flags used. In such cases, the :variable:`CMAKE_<LANG>_SIMULATE_ID` variable
-contains the ID of the compiler being simulated, and
-:variable:`CMAKE_<LANG>_SIMULATE_VERSION` its version.
+version of the compiler.
 
 The :variable:`CMAKE_<LANG>_FLAGS` variables and the configuration-specific
 equivalents contain flags that will be added to the compile command when
@@ -69,10 +61,9 @@ As the linker is invoked by the compiler driver, CMake needs a way to determine
 which compiler to use to invoke the linker. This is calculated by the
 :prop_sf:`LANGUAGE` of source files in the target, and in the case of static
 libraries, the language of the dependent libraries. The choice CMake makes may
-be overridden with the :variable:`CMAKE_<LANG>_LINKER_PREFERENCE` variable and
-the :prop_tgt:`LINKER_LANGUAGE` target property.
+be overridden with the :prop_tgt:`LINKER_LANGUAGE` target property.
 
-Toolchain features
+Toolchain Features
 ==================
 
 CMake provides the :command:`try_compile` command and wrapper macros such as
@@ -89,7 +80,7 @@ the compiler supports that feature. The :prop_tgt:`<LANG>_VISIBILITY_PRESET`
 and :prop_tgt:`VISIBILITY_INLINES_HIDDEN` target properties add flags for
 hidden visibility, if supported by the compiler.
 
-Cross-compiling
+Cross Compiling
 ===============
 
 If :manual:`cmake(1)` is invoked with the command line parameter

-----------------------------------------------------------------------

Summary of changes:
 Help/manual/cmake-toolchains.7.rst |   21 ++++++---------------
 1 files changed, 6 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake