kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow more than one external MS project

This commit is contained in:
Phil Pritchett 2001-11-02 11:19:15 -05:00
parent 36e7b5567a
commit 8c582aae12
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmDSPWriter.cxx
View File

@ -128,7 +128,7 @@ void cmDSPWriter::OutputDSPFile()
// so don't build a projectfile for it
if ((l->second.GetType() != cmTarget::INSTALL_FILES)
&& (l->second.GetType() != cmTarget::INSTALL_PROGRAMS)
&& (l->first != "INCLUDE_EXTERNAL_MSPROJECT"))
&& (l->first.compare(0,26, "INCLUDE_EXTERNAL_MSPROJECT") != 0))
{
this->CreateSingleDSP(l->first.c_str(),l->second);
}

2
Source/cmDSWWriter.cxx
View File

@ -172,7 +172,7 @@ void cmDSWWriter::WriteDSWFile(std::ostream& fout)
}
}
// Write the project into the DSW file
if (l->first == "INCLUDE_EXTERNAL_MSPROJECT")
if (l->first.compare(0,26, "INCLUDE_EXTERNAL_MSPROJECT") == 0)
{
cmCustomCommand cc = l->second.GetCustomCommands()[0];

6
Source/cmIncludeExternalMSProjectCommand.cxx
View File

@ -25,8 +25,12 @@ bool cmIncludeExternalMSProjectCommand::InitialPass(std::vector<std::string> con
depends.push_back(args[i]);
}
}
std::string utility_name("INCLUDE_EXTERNAL_MSPROJECT");
utility_name += "_";
utility_name += args[0];
m_Makefile->AddUtilityCommand("INCLUDE_EXTERNAL_MSPROJECT", "echo", "\"Include external project\"",
m_Makefile->AddUtilityCommand(utility_name.c_str(), "echo", "\"Include external project\"",
false, name_and_location, depends);
}