[Cmake-commits] CMake branch, next, updated. v2.8.2-133-g3baccb4

[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  3baccb49d9ebd104c5a8800a2d943c3c247ca5c6 (commit)
       via  295b5b60df5d9427fdb891fd51333c12089ee129 (commit)
      from  9baf8388621af3b9296d74ade9397598013cc907 (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=3baccb49d9ebd104c5a8800a2d943c3c247ca5c6
commit 3baccb49d9ebd104c5a8800a2d943c3c247ca5c6
Merge: 9baf838 295b5b6
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 08:37:57 2010 -0400

    Merge branch 'user-override-try-compile' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=295b5b60df5d9427fdb891fd51333c12089ee129
commit 295b5b60df5d9427fdb891fd51333c12089ee129
Author: David Genest <david.genest at ubisoft.com>
Date:   Tue Jun 29 08:28:47 2010 -0400

    Honor CMAKE_USER_MAKE_RULES_OVERRIDE in try_compile (#10902)

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index dab0c0d..fcec3e9 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -175,6 +175,23 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
       {
       fprintf(fout, "SET(CMAKE_MODULE_PATH %s)\n", def);
       }
+
+    const char* rulesOverrideBase = "CMAKE_USER_MAKE_RULES_OVERRIDE";
+    std::string rulesOverrideLang =
+      rulesOverrideBase + (lang ? std::string("_") + lang : "");
+    if(const char* rulesOverridePath =
+       this->Makefile->GetDefinition(rulesOverrideLang.c_str()))
+      {
+      fprintf(fout, "SET(%s \"%s\")\n",
+              rulesOverrideLang.c_str(), rulesOverridePath);
+      }
+    else if(const char* rulesOverridePath2 =
+            this->Makefile->GetDefinition(rulesOverrideBase))
+      {
+      fprintf(fout, "SET(%s \"%s\")\n",
+              rulesOverrideBase, rulesOverridePath2);
+      }
+
     if(lang)
       {
       fprintf(fout, "PROJECT(CMAKE_TRY_COMPILE %s)\n", lang);

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

Summary of changes:
 Source/cmCoreTryCompile.cxx |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake