[Cmake-commits] CMake branch, next, updated. v2.8.2-981-ga1873d8

[Ben Boeckel]

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  a1873d89f4a8d61b9df208b559a27cac2bbc83d9 (commit)
       via  9b90040edba1f89395295c27cd9919b0d5efd30b (commit)
      from  d34630d1246763a3985ab93d7770ec03c488b7e0 (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=a1873d89f4a8d61b9df208b559a27cac2bbc83d9
commit a1873d89f4a8d61b9df208b559a27cac2bbc83d9
Merge: d34630d 9b90040
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 1 13:46:10 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 1 13:46:10 2010 -0400

    Merge topic 'dev/strict-mode' into next
    
    9b90040 When calling CMake, set the args and the cache


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9b90040edba1f89395295c27cd9919b0d5efd30b
commit 9b90040edba1f89395295c27cd9919b0d5efd30b
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 1 13:44:55 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Oct 1 13:44:55 2010 -0400

    When calling CMake, set the args and the cache

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 86aca5a..99b6bc3 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2810,6 +2810,7 @@ int cmMakefile::TryCompile(const char *srcdir, const char *bindir,
   // if cmake args were provided then pass them in
   if (cmakeArgs)
     {
+    cm.SetArgs(*cmakeArgs);
     cm.SetCacheArgs(*cmakeArgs);
     }
   // to save time we pass the EnableLanguage info directly

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

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


hooks/post-receive
-- 
CMake