diff options
| author | Phil Pritchett <p.pritchett@2d3.com> | 2001-11-02 16:19:15 (GMT) |
|---|---|---|
| committer | Phil Pritchett <p.pritchett@2d3.com> | 2001-11-02 16:19:15 (GMT) |
| commit | 8c582aae126b8143fd22667893cc612664279275 (patch) | |
| tree | eda28bef26b04a7aff6c9c13357d0a1373330fa4 | |
| parent | 36e7b5567a6706623bf8b73a5bf9d8475ca7a8ce (diff) | |
| download | CMake-8c582aae126b8143fd22667893cc612664279275.zip CMake-8c582aae126b8143fd22667893cc612664279275.tar.gz CMake-8c582aae126b8143fd22667893cc612664279275.tar.bz2 | |
allow more than one external MS project
| -rw-r--r-- | Source/cmDSPWriter.cxx | 2 | ||||
| -rw-r--r-- | Source/cmDSWWriter.cxx | 2 | ||||
| -rw-r--r-- | Source/cmIncludeExternalMSProjectCommand.cxx | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/Source/cmDSPWriter.cxx b/Source/cmDSPWriter.cxx index 8985b8e..8f8b3f1 100644 --- a/Source/cmDSPWriter.cxx +++ b/Source/cmDSPWriter.cxx @@ -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); } diff --git a/Source/cmDSWWriter.cxx b/Source/cmDSWWriter.cxx index 07ad24d..d86ba2a 100644 --- a/Source/cmDSWWriter.cxx +++ b/Source/cmDSWWriter.cxx @@ -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]; diff --git a/Source/cmIncludeExternalMSProjectCommand.cxx b/Source/cmIncludeExternalMSProjectCommand.cxx index 3968ce4..e7a2da4 100644 --- a/Source/cmIncludeExternalMSProjectCommand.cxx +++ b/Source/cmIncludeExternalMSProjectCommand.cxx @@ -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); } |