summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBen Boeckel <ben.boeckel@kitware.com>2010-10-05 16:27:37 (GMT)
committerBen Boeckel <ben.boeckel@kitware.com>2010-10-05 16:27:37 (GMT)
commit367e5c37bbaba8f2169ed5a56e553e9327b8951a (patch)
tree4df6a3e9b6e84ccff2b499b379222ac478de44a1 /Source/cmMakefile.cxx
parentab5d4e43d9a9ddde24a242092a0d5e5f9a6cbd01 (diff)
downloadCMake-367e5c37bbaba8f2169ed5a56e553e9327b8951a.zip
CMake-367e5c37bbaba8f2169ed5a56e553e9327b8951a.tar.gz
CMake-367e5c37bbaba8f2169ed5a56e553e9327b8951a.tar.bz2
Revert "Revert "When calling CMake, set the args and the cache""
This reverts commit ab5d4e43d9a9ddde24a242092a0d5e5f9a6cbd01.
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx1
1 files changed, 1 insertions, 0 deletions
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