[Cmake-commits] CMake branch, next, updated. v3.7.0-1309-ga90b109

[Brad King]

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  a90b109787bd7e62dd478149992fea0a3bb00b5c (commit)
       via  df9fea7f495cc0cc495782abfe4a7b0a0a3122ec (commit)
      from  2a46ccf4a510d719956769de05e6df2f160005b5 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a90b109787bd7e62dd478149992fea0a3bb00b5c
commit a90b109787bd7e62dd478149992fea0a3bb00b5c
Merge: 2a46ccf df9fea7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 21 14:25:48 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 21 14:25:48 2016 -0500

    Merge topic 'doc-CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT' into next
    
    df9fea7f Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=df9fea7f495cc0cc495782abfe4a7b0a0a3122ec
commit df9fea7f495cc0cc495782abfe4a7b0a0a3122ec
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 21 11:49:33 2016 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Nov 21 11:52:00 2016 -0500

    Help: Document CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT variable
    
    This variable documentation was simply missing.
    
    Suggested-by: Craig Scott <craig.scott at crascit.com>

diff --git a/Help/manual/cmake-variables.7.rst b/Help/manual/cmake-variables.7.rst
index b74f867..3b08a74 100644
--- a/Help/manual/cmake-variables.7.rst
+++ b/Help/manual/cmake-variables.7.rst
@@ -148,6 +148,7 @@ Variables that Change Behavior
    /variable/CMAKE_INSTALL_DEFAULT_COMPONENT_NAME
    /variable/CMAKE_INSTALL_MESSAGE
    /variable/CMAKE_INSTALL_PREFIX
+   /variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
    /variable/CMAKE_LIBRARY_PATH
    /variable/CMAKE_MFC_FLAG
    /variable/CMAKE_MODULE_PATH
diff --git a/Help/variable/CMAKE_INSTALL_PREFIX.rst b/Help/variable/CMAKE_INSTALL_PREFIX.rst
index 86f1944..7bd87d6 100644
--- a/Help/variable/CMAKE_INSTALL_PREFIX.rst
+++ b/Help/variable/CMAKE_INSTALL_PREFIX.rst
@@ -6,6 +6,8 @@ Install directory used by :command:`install`.
 If ``make install`` is invoked or ``INSTALL`` is built, this directory is
 prepended onto all install directories.  This variable defaults to
 ``/usr/local`` on UNIX and ``c:/Program Files/${PROJECT_NAME}`` on Windows.
+See :variable:`CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT` for how a
+project might choose its own default.
 
 On UNIX one can use the ``DESTDIR`` mechanism in order to relocate the
 whole installation.  ``DESTDIR`` means DESTination DIRectory.  It is
diff --git a/Help/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.rst b/Help/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.rst
new file mode 100644
index 0000000..2a5842d
--- /dev/null
+++ b/Help/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.rst
@@ -0,0 +1,14 @@
+CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
+-------------------------------------------
+
+CMake sets this variable to a ``TRUE`` value when the
+:variable:`CMAKE_INSTALL_PREFIX` has just been initialized to
+its default value, typically on the first run of CMake within
+a new build tree.  This can be used by project code to change
+the default without overriding a user-provided value:
+
+.. code-block:: cmake
+
+  if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+    set(CMAKE_INSTALL_PREFIX "/my/default" CACHE PATH "..." FORCE)
+  endif()

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

Summary of changes:
 Help/manual/cmake-variables.7.rst                        |    1 +
 Help/variable/CMAKE_INSTALL_PREFIX.rst                   |    2 ++
 .../CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.rst      |   14 ++++++++++++++
 3 files changed, 17 insertions(+)
 create mode 100644 Help/variable/CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT.rst


hooks/post-receive
-- 
CMake