[Cmake-commits] CMake branch, next, updated. v2.8.12-4790-g4580b5a

[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  4580b5a73ecfb1c0d6f6e3e5fc96f3949fc67b26 (commit)
       via  12d10a00ac03ad206e00cbec321e76415e2adbe0 (commit)
      from  6aa46418922ddde16ff015b1a811bf32f925e6c1 (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=4580b5a73ecfb1c0d6f6e3e5fc96f3949fc67b26
commit 4580b5a73ecfb1c0d6f6e3e5fc96f3949fc67b26
Merge: 6aa4641 12d10a0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 2 11:06:45 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Nov 2 11:06:45 2013 -0400

    Merge topic 'doc-CMAKE_INCLUDE_DIRECTORIES_BEFORE' into next
    
    12d10a0 Add missing documentation for include dirs related variables. (#12611)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12d10a00ac03ad206e00cbec321e76415e2adbe0
commit 12d10a00ac03ad206e00cbec321e76415e2adbe0
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Sat Nov 2 15:56:54 2013 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Sat Nov 2 16:06:19 2013 +0100

    Add missing documentation for include dirs related variables. (#12611)
    
    Document CMAKE_INCLUDE_DIRECTORIES_BEFORE and
    CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.

diff --git a/Help/command/include_directories.rst b/Help/command/include_directories.rst
index 6744427..3e0c7a0 100644
--- a/Help/command/include_directories.rst
+++ b/Help/command/include_directories.rst
@@ -19,7 +19,7 @@ used by the generators.
 
 By default the directories are appended onto the current list of
 directories.  This default behavior can be changed by setting
-CMAKE_INCLUDE_DIRECTORIES_BEFORE to ON.  By using AFTER or BEFORE
+:variable:`CMAKE_INCLUDE_DIRECTORIES_BEFORE` to ON.  By using AFTER or BEFORE
 explicitly, you can select between appending and prepending,
 independent of the default.
 
diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index 26205a8..59e8064 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -97,6 +97,8 @@ Variables that Change Behavior
    /variable/CMAKE_FIND_NO_INSTALL_PREFIX
    /variable/CMAKE_IGNORE_PATH
    /variable/CMAKE_INCLUDE_PATH
+   /variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE
+   /variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE
    /variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
    /variable/CMAKE_INSTALL_PREFIX
    /variable/CMAKE_LIBRARY_PATH
diff --git a/Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst b/Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst
new file mode 100644
index 0000000..3c1fbcf
--- /dev/null
+++ b/Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst
@@ -0,0 +1,8 @@
+CMAKE_INCLUDE_DIRECTORIES_BEFORE
+--------------------------------
+
+Whether to append or prepend directories by default in :command:`include_directories`.
+
+This variable affects the default behavior of the :command:`include_directories`
+command. Setting this variable to 'ON' is equivalent to using the BEFORE option
+in all uses of that command.
diff --git a/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst b/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
new file mode 100644
index 0000000..cbd04d7
--- /dev/null
+++ b/Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst
@@ -0,0 +1,8 @@
+CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE
+----------------------------------------
+
+Whether to force prepending of project include directories.
+
+This variable affects the order of include directories generated in compiler
+command lines.  If set to 'ON', it causes the :variable:`CMAKE_SOURCE_DIR` and
+the :variable:`CMAKE_BINARY_DIR` to appear first.

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

Summary of changes:
 Help/command/include_directories.rst               |    2 +-
 Help/manual/cmake-variables.7.rst                  |    2 ++
 Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst |    8 ++++++++
 .../CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst   |    8 ++++++++
 4 files changed, 19 insertions(+), 1 deletions(-)
 create mode 100644 Help/variable/CMAKE_INCLUDE_DIRECTORIES_BEFORE.rst
 create mode 100644 Help/variable/CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE.rst


hooks/post-receive
-- 
CMake