[Cmake-commits] CMake branch, next, updated. v2.8.2-1001-gfe23957

[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  fe239577314c09323e52c68f6c4bddbd19af915e (commit)
       via  82ed104dcb7d380e23fecfb4e7911f5eab093436 (commit)
       via  5aa535bdcb9d1148690e55b601e1c8f8763f842c (commit)
       via  367e5c37bbaba8f2169ed5a56e553e9327b8951a (commit)
      from  97c18a0af4bf1b14da39ac8d07f16e69db6d48eb (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=fe239577314c09323e52c68f6c4bddbd19af915e
commit fe239577314c09323e52c68f6c4bddbd19af915e
Merge: 97c18a0 82ed104
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Oct 5 13:48:20 2010 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 5 13:48:20 2010 -0400

    Merge topic 'dev/strict-mode' into next
    
    82ed104 Flag that the directories have been set
    5aa535b Add argument to arg parsing to not set directories
    367e5c3 Revert "Revert "When calling CMake, set the args and the cache""


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=82ed104dcb7d380e23fecfb4e7911f5eab093436
commit 82ed104dcb7d380e23fecfb4e7911f5eab093436
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Oct 5 13:45:34 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Oct 5 13:45:34 2010 -0400

    Flag that the directories have been set

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 99b6bc3..a4a79be 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2810,7 +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.SetArgs(*cmakeArgs, true);
     cm.SetCacheArgs(*cmakeArgs);
     }
   // to save time we pass the EnableLanguage info directly

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5aa535bdcb9d1148690e55b601e1c8f8763f842c
commit 5aa535bdcb9d1148690e55b601e1c8f8763f842c
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Oct 5 13:44:28 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Oct 5 13:44:28 2010 -0400

    Add argument to arg parsing to not set directories
    
    Argument parsing sets the source/build directories, but they may have
    been (meaningfully) set before hand. Let's not overwrite them.

diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 07abc8e..845ab9b 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -524,9 +524,9 @@ void cmake::ReadListFile(const char *path)
 }
 
 // Parse the args
-void cmake::SetArgs(const std::vector<std::string>& args)
+void cmake::SetArgs(const std::vector<std::string>& args, bool directoriesSetBefore)
 {
-  bool directoriesSet = false;
+  bool directoriesSet = directoriesSetBefore;
   for(unsigned int i=1; i < args.size(); ++i)
     {
     std::string arg = args[i];
diff --git a/Source/cmake.h b/Source/cmake.h
index 72effd3..36c0f4a 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -212,7 +212,7 @@ class cmake
   bool CommandExists(const char* name) const;
     
   ///! Parse command line arguments
-  void SetArgs(const std::vector<std::string>&);
+  void SetArgs(const std::vector<std::string>&, bool directoriesSetBefore = false);
 
   ///! Is this cmake running as a result of a TRY_COMPILE command
   bool GetIsInTryCompile() { return this->InTryCompile; }

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=367e5c37bbaba8f2169ed5a56e553e9327b8951a
commit 367e5c37bbaba8f2169ed5a56e553e9327b8951a
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Oct 5 12:27:37 2010 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Oct 5 12:27:37 2010 -0400

    Revert "Revert "When calling CMake, set the args and the cache""
    
    This reverts commit ab5d4e43d9a9ddde24a242092a0d5e5f9a6cbd01.

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 +
 Source/cmake.cxx      |    4 ++--
 Source/cmake.h        |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake