[Cmake-commits] CMake branch, master, updated. v2.8.3-581-g7f37eac

[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, master has been updated
       via  7f37eac6dd7f26c33b0c80b99f862ac0f53e6a8e (commit)
       via  5792d3a38a67c8e3fffa7e2743a106a87ff7096c (commit)
       via  a5300f1d450daaac7d9a421710141897af304c45 (commit)
      from  7e6a00465989208905432bd41885db6133fa2742 (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=7f37eac6dd7f26c33b0c80b99f862ac0f53e6a8e
commit 7f37eac6dd7f26c33b0c80b99f862ac0f53e6a8e
Merge: 7e6a004 5792d3a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 26 15:24:44 2011 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 26 15:24:44 2011 -0500

    Merge topic 'outdir-CMAKE_USER_MAKE_RULES_OVERRIDE'
    
    5792d3a Always place try_compile executables predictably (#11724)
    a5300f1 Clarify CMAKE_USER_MAKE_RULES_OVERRIDE documentation (#11724)

diff --cc Source/cmDocumentVariables.cxx
index e9b54d8,40d416f..6fffecb
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@@ -696,15 -625,31 +696,31 @@@ void cmDocumentVariables::DefineVariabl
  
    cm->DefineProperty
      ("CMAKE_USER_MAKE_RULES_OVERRIDE", cmProperty::VARIABLE,
-      "Specify a file that can change the build rule variables.",
-      "If this variable is set, it should to point to a "
-      "CMakeLists.txt file that will be read in by CMake "
-      "after all the system settings have been set, but "
-      "before they have been used.  This would allow you "
-      "to override any variables that need to be changed "
-      "for some special project. ",false,
+      "Specify a CMake file that overrides platform information.",
+      "CMake loads the specified file while enabling support for each "
+      "language from either the project() or enable_language() commands.  "
+      "It is loaded after CMake's builtin compiler and platform information "
+      "modules have been loaded but before the information is used.  "
+      "The file may set platform information variables to override CMake's "
+      "defaults."
+      "\n"
+      "This feature is intended for use only in overriding information "
+      "variables that must be set before CMake builds its first test "
+      "project to check that the compiler for a language works.  "
+      "It should not be used to load a file in cases that a normal include() "
+      "will work.  "
+      "Use it only as a last resort for behavior that cannot be achieved "
+      "any other way.  "
+      "For example, one may set CMAKE_C_FLAGS_INIT to change the default "
+      "value used to initialize CMAKE_C_FLAGS before it is cached.  "
+      "The override file should NOT be used to set anything that could "
+      "be set after languages are enabled, such as variables like "
+      "CMAKE_RUNTIME_OUTPUT_DIRECTORY that affect the placement of binaries.  "
+      "Information set in the file will be used for try_compile and try_run "
+      "builds too."
+      ,false,
       "Variables That Change Behavior");
 -  
 +
    cm->DefineProperty
      ("BUILD_SHARED_LIBS", cmProperty::VARIABLE,
       "Global flag to cause add_library to create shared libraries if on.",

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

Summary of changes:
 Source/cmCoreTryCompile.cxx    |    4 +++
 Source/cmDocumentVariables.cxx |   41 ++++++++++++++++++++++++++-------------
 2 files changed, 31 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
CMake