[Cmake-commits] CMake branch, next, updated. v2.8.1-1441-g7bcca70

[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  7bcca70df64dbc0f94e87c082a69e2da6f2684e9 (commit)
       via  0a7c551bf61310859e47ebcce95e176a96db76bb (commit)
       via  e45a600a0fae6d8fe0de6bba10e3a6fab5204bb4 (commit)
       via  dc2f8590d112e3c0050924b4e9438648484254e9 (commit)
       via  10c84dc10e0e3fe9f742ee698840066dc7f7f667 (commit)
       via  abe355ef1ca075c78dfea75f808a256b052699ec (commit)
      from  d2c75bd0014099019e85bc13e956f4c7f4cc8441 (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=7bcca70df64dbc0f94e87c082a69e2da6f2684e9
commit 7bcca70df64dbc0f94e87c082a69e2da6f2684e9
Merge: d2c75bd 0a7c551
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 21 11:00:21 2010 -0400

    Merge branch 'script-mode-keep-makeflags' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a7c551bf61310859e47ebcce95e176a96db76bb
commit 0a7c551bf61310859e47ebcce95e176a96db76bb
Author: Brad King <brad.king at kitware.com>
Date:   Mon Jun 21 10:50:11 2010 -0400

    Preserve ENV{MAKEFLAGS} in CMake script mode
    
    Commit 02f7cfbc (Need to remove the MAKEFLAGS when cmake starts,
    2003-05-13) removed the MAKEFLAGS environment variable when CMake starts
    to prevent try_compile() from inheriting "make -i".  This is unnecessary
    in script mode (cmake -P).  Instead remove the variable only when
    configuring a project.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index f766d47..c009db9 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -162,16 +162,6 @@ cmake::cmake()
     }
 #endif
 
-  // If MAKEFLAGS are given in the environment, remove the environment
-  // variable.  This will prevent try-compile from succeeding when it
-  // should fail (if "-i" is an option).  We cannot simply test
-  // whether "-i" is given and remove it because some make programs
-  // encode the MAKEFLAGS variable in a strange way.
-  if(getenv("MAKEFLAGS"))
-    {
-    cmSystemTools::PutEnv("MAKEFLAGS=");
-    }
-
   this->Verbose = false;
   this->InTryCompile = false;
   this->CacheManager = new cmCacheManager(this);
@@ -2231,6 +2221,16 @@ int cmake::Run(const std::vector<std::string>& args, bool noconfigure)
       }
     }
 
+  // If MAKEFLAGS are given in the environment, remove the environment
+  // variable.  This will prevent try-compile from succeeding when it
+  // should fail (if "-i" is an option).  We cannot simply test
+  // whether "-i" is given and remove it because some make programs
+  // encode the MAKEFLAGS variable in a strange way.
+  if(getenv("MAKEFLAGS"))
+    {
+    cmSystemTools::PutEnv("MAKEFLAGS=");
+    }
+
   this->PreLoadCMakeFiles();
 
   std::string systemFile = this->GetHomeOutputDirectory();

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

Summary of changes:
 Source/cmake.cxx                  |   20 ++++++++++----------
 Source/kwsys/kwsysDateStamp.cmake |    2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
CMake