summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator2.cxx
diff options
context:
space:
mode:
authorKen Martin <ken.martin@kitware.com>2005-05-12 14:49:56 (GMT)
committerKen Martin <ken.martin@kitware.com>2005-05-12 14:49:56 (GMT)
commitcaf17c123b79bd079408258a1ba13bdcd2105e59 (patch)
treee0350c8152c69f400991099925887169bf13a455 /Source/cmLocalUnixMakefileGenerator2.cxx
parente1c9730a0107c0c4af946afa25525c9de9dcd33b (diff)
downloadCMake-caf17c123b79bd079408258a1ba13bdcd2105e59.zip
CMake-caf17c123b79bd079408258a1ba13bdcd2105e59.tar.gz
CMake-caf17c123b79bd079408258a1ba13bdcd2105e59.tar.bz2
ENH: added new generator
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator2.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator2.cxx12
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator2.cxx b/Source/cmLocalUnixMakefileGenerator2.cxx
index 4a8f6e2..c8d2f17 100644
--- a/Source/cmLocalUnixMakefileGenerator2.cxx
+++ b/Source/cmLocalUnixMakefileGenerator2.cxx
@@ -535,7 +535,9 @@ cmLocalUnixMakefileGenerator2
cmOStringStream depCmd;
// TODO: Account for source file properties and directory-level
// definitions when scanning for dependencies.
- depCmd << "$(CMAKE_COMMAND) -E cmake_depends " << lang << " "
+ depCmd << "$(CMAKE_COMMAND) -E cmake_depends \""
+ << m_GlobalGenerator->GetName() << "\" "
+ << lang << " "
<< this->ConvertToRelativeOutputPath(obj.c_str()) << " "
<< this->ConvertToRelativeOutputPath(source.GetFullPath().c_str());
commands.push_back(depCmd.str());
@@ -3131,17 +3133,17 @@ cmLocalUnixMakefileGenerator2
::ScanDependencies(std::vector<std::string> const& args)
{
// Format of arguments is:
- // $(CMAKE_COMMAND), cmake_depends, <lang>, <obj>, <src>
+ // $(CMAKE_COMMAND), cmake_depends, GeneratorName, <lang>, <obj>, <src>
// The caller has ensured that all required arguments exist.
// The language for which we are scanning dependencies.
- std::string const& lang = args[2];
+ std::string const& lang = args[3];
// The file to which to write dependencies.
- const char* objFile = args[3].c_str();
+ const char* objFile = args[4].c_str();
// The source file at which to start the scan.
- const char* srcFile = args[4].c_str();
+ const char* srcFile = args[5].c_str();
// Read the directory information file.
cmake cm;