[Cmake-commits] CMake branch, next, updated. v2.8.2-983-g4693b2d
Ben Boeckel
ben.boeckel at kitware.com
Fri Oct 1 16:53:18 EDT 2010
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 4693b2d84ae3b1cc5495b72fbd76ed90d6922ebb (commit)
via ab5d4e43d9a9ddde24a242092a0d5e5f9a6cbd01 (commit)
from a1873d89f4a8d61b9df208b559a27cac2bbc83d9 (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=4693b2d84ae3b1cc5495b72fbd76ed90d6922ebb
commit 4693b2d84ae3b1cc5495b72fbd76ed90d6922ebb
Merge: a1873d8 ab5d4e4
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 1 16:53:13 2010 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 1 16:53:13 2010 -0400
Merge topic 'dev/strict-mode' into next
ab5d4e4 Revert "When calling CMake, set the args and the cache"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ab5d4e43d9a9ddde24a242092a0d5e5f9a6cbd01
commit ab5d4e43d9a9ddde24a242092a0d5e5f9a6cbd01
Author: Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Fri Oct 1 16:52:16 2010 -0400
Commit: Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Fri Oct 1 16:52:16 2010 -0400
Revert "When calling CMake, set the args and the cache"
This reverts commit 9b90040edba1f89395295c27cd9919b0d5efd30b.
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 99b6bc3..86aca5a 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -2810,7 +2810,6 @@ 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, 0 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list