diff options
| author | Ken Martin <ken.martin@kitware.com> | 2005-03-18 15:41:41 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2005-03-18 15:41:41 (GMT) |
| commit | 345cf0401235a1fd64bb9b1c353e0e3fc848d666 (patch) | |
| tree | 6c1862e3516cd436f3068221ae9fcc11144724b8 /Source/cmSubdirCommand.cxx | |
| parent | 1f9df24ba7e76cbd7ecc1816a9f8d46b61816e95 (diff) | |
| download | CMake-345cf0401235a1fd64bb9b1c353e0e3fc848d666.zip CMake-345cf0401235a1fd64bb9b1c353e0e3fc848d666.tar.gz CMake-345cf0401235a1fd64bb9b1c353e0e3fc848d666.tar.bz2 | |
ENH: big change that includes immediate subdir support, removing the notion of inherited commands, makefiles no longer read in the parent makefiles but instead inherit thier parent makefiles current settings
Diffstat (limited to 'Source/cmSubdirCommand.cxx')
| -rw-r--r-- | Source/cmSubdirCommand.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmSubdirCommand.cxx b/Source/cmSubdirCommand.cxx index 56cae36..ab43892 100644 --- a/Source/cmSubdirCommand.cxx +++ b/Source/cmSubdirCommand.cxx @@ -51,7 +51,7 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args) std::string(m_Makefile->GetCurrentOutputDirectory()) + "/" + i->c_str(); m_Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(), - intoplevel, preorder); + intoplevel, preorder, false); } // otherwise it is a full path else if ( cmSystemTools::FileIsDirectory(i->c_str()) ) @@ -62,7 +62,7 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& args) std::string(m_Makefile->GetCurrentOutputDirectory()) + "/" + cmSystemTools::GetFilenameName(i->c_str()); m_Makefile->AddSubDirectory(i->c_str(), binPath.c_str(), - intoplevel, preorder); + intoplevel, preorder, false); } else { |