[Cmake-commits] [cmake-commits] hoffman committed cmGlobalVisualStudio6Generator.cxx 1.77 1.78 cmGlobalVisualStudio6Generator.h 1.29 1.30 cmGlobalVisualStudio71Generator.cxx 1.53 1.54 cmGlobalVisualStudio71Generator.h 1.18 1.19 cmGlobalVisualStudio7Generator.cxx 1.106 1.107 cmGlobalVisualStudio7Generator.h 1.48 1.49 cmGlobalVisualStudioGenerator.cxx 1.15 1.16 cmGlobalVisualStudioGenerator.h 1.8 1.9 cmIncludeExternalMSProjectCommand.cxx 1.23 1.24 cmLocalGenerator.cxx 1.302 1.303 cmLocalVisualStudio10Generator.cxx 1.3 1.4 cmLocalVisualStudio6Generator.cxx 1.157 1.158 cmLocalVisualStudio7Generator.cxx 1.247 1.248 cmVisualStudio10TargetGenerator.cxx 1.11 1.12
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jul 14 14:16:48 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv27659/Source
Modified Files:
cmGlobalVisualStudio6Generator.cxx
cmGlobalVisualStudio6Generator.h
cmGlobalVisualStudio71Generator.cxx
cmGlobalVisualStudio71Generator.h
cmGlobalVisualStudio7Generator.cxx
cmGlobalVisualStudio7Generator.h
cmGlobalVisualStudioGenerator.cxx
cmGlobalVisualStudioGenerator.h
cmIncludeExternalMSProjectCommand.cxx cmLocalGenerator.cxx
cmLocalVisualStudio10Generator.cxx
cmLocalVisualStudio6Generator.cxx
cmLocalVisualStudio7Generator.cxx
cmVisualStudio10TargetGenerator.cxx
Log Message:
ENH: remove INCLUDE_EXTERNAL_MSPROJECT name hack, and use target properties instead, fix VXExternalInclude test for VS10
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.247
retrieving revision 1.248
diff -C 2 -d -r1.247 -r1.248
*** cmLocalVisualStudio7Generator.cxx 10 Jul 2009 13:12:35 -0000 1.247
--- cmLocalVisualStudio7Generator.cxx 14 Jul 2009 18:16:46 -0000 1.248
***************
*** 160,164 ****
// INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
// so don't build a projectfile for it
! if (strncmp(l->first.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) != 0)
{
this->CreateSingleVCProj(l->first.c_str(),l->second);
--- 160,164 ----
// INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
// so don't build a projectfile for it
! if(!l->second.GetProperty("EXTERNAL_MSPROJECT"))
{
this->CreateSingleVCProj(l->first.c_str(),l->second);
***************
*** 1977,1987 ****
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
{
! if (strncmp(l->first.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
{
! cmCustomCommand cc = l->second.GetPostBuildCommands()[0];
! const cmCustomCommandLines& cmds = cc.GetCommandLines();
! std::string project_name = cmds[0][0];
! this->ReadAndStoreExternalGUID(project_name.c_str(),
! cmds[0][1].c_str());
}
else
--- 1977,1985 ----
for(cmTargets::iterator l = tgts.begin(); l != tgts.end(); l++)
{
! const char* path = l->second.GetProperty("EXTERNAL_MSPROJECT");
! if(path)
{
! this->ReadAndStoreExternalGUID(
! l->second.GetName(), path);
}
else
Index: cmGlobalVisualStudioGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudioGenerator.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C 2 -d -r1.8 -r1.9
*** cmGlobalVisualStudioGenerator.h 30 Apr 2008 17:26:03 -0000 1.8
--- cmGlobalVisualStudioGenerator.h 14 Jul 2009 18:16:46 -0000 1.9
***************
*** 67,75 ****
// return true if target is fortran only
bool TargetIsFortranOnly(cmTarget& t);
protected:
virtual void CreateGUID(const char*) {}
void FixUtilityDepends();
- const char* GetUtilityForTarget(cmTarget& target, const char*);
// Does this VS version link targets to each other if there are
--- 67,75 ----
// return true if target is fortran only
bool TargetIsFortranOnly(cmTarget& t);
+ const char* GetUtilityForTarget(cmTarget& target, const char*);
protected:
virtual void CreateGUID(const char*) {}
void FixUtilityDepends();
// Does this VS version link targets to each other if there are
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.302
retrieving revision 1.303
diff -C 2 -d -r1.302 -r1.303
*** cmLocalGenerator.cxx 7 Jul 2009 11:44:09 -0000 1.302
--- cmLocalGenerator.cxx 14 Jul 2009 18:16:46 -0000 1.303
***************
*** 194,208 ****
for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
{
! // INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
! // so don't build a projectfile for it
! if (strncmp(t->first.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) != 0)
{
! const char* projectFilename = 0;
! if (this->IsMakefileGenerator == false) // only use of this variable
! {
! projectFilename = t->second.GetName();
! }
! t->second.TraceDependencies(projectFilename);
}
}
}
--- 194,203 ----
for(cmTargets::iterator t = targets.begin(); t != targets.end(); ++t)
{
! const char* projectFilename = 0;
! if (this->IsMakefileGenerator == false) // only use of this variable
{
! projectFilename = t->second.GetName();
}
+ t->second.TraceDependencies(projectFilename);
}
}
Index: cmGlobalVisualStudio71Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio71Generator.cxx,v
retrieving revision 1.53
retrieving revision 1.54
diff -C 2 -d -r1.53 -r1.54
*** cmGlobalVisualStudio71Generator.cxx 10 Jul 2009 13:12:27 -0000 1.53
--- cmGlobalVisualStudio71Generator.cxx 14 Jul 2009 18:16:46 -0000 1.54
***************
*** 255,259 ****
const char* name,
const char* location,
! const std::vector<std::string>& depends)
{
fout << "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \""
--- 255,259 ----
const char* name,
const char* location,
! const std::set<cmStdString>& depends)
{
fout << "Project(\"{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}\") = \""
***************
*** 268,272 ****
{
fout << "\tProjectSection(ProjectDependencies) = postProject\n";
! std::vector<std::string>::const_iterator it;
for(it = depends.begin(); it != depends.end(); ++it)
{
--- 268,272 ----
{
fout << "\tProjectSection(ProjectDependencies) = postProject\n";
! std::set<cmStdString>::const_iterator it;
for(it = depends.begin(); it != depends.end(); ++it)
{
Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.157
retrieving revision 1.158
diff -C 2 -d -r1.157 -r1.158
*** cmLocalVisualStudio6Generator.cxx 7 Jul 2009 11:44:10 -0000 1.157
--- cmLocalVisualStudio6Generator.cxx 14 Jul 2009 18:16:46 -0000 1.158
***************
*** 201,205 ****
// INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
// so don't build a projectfile for it
! if (strncmp(l->first.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) != 0)
{
// check to see if the dsp is going into a sub-directory
--- 201,207 ----
// INCLUDE_EXTERNAL_MSPROJECT command only affects the workspace
// so don't build a projectfile for it
! const char* path =
! l->second.GetProperty("EXTERNAL_MSPROJECT");
! if(!path)
{
// check to see if the dsp is going into a sub-directory
Index: cmIncludeExternalMSProjectCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIncludeExternalMSProjectCommand.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -C 2 -d -r1.23 -r1.24
*** cmIncludeExternalMSProjectCommand.cxx 28 Jan 2008 13:38:35 -0000 1.23
--- cmIncludeExternalMSProjectCommand.cxx 14 Jul 2009 18:16:46 -0000 1.24
***************
*** 31,50 ****
if(this->Makefile->GetDefinition("WIN32"))
{
- std::string location = args[1];
-
- std::vector<std::string> depends;
- if (args.size() > 2)
- {
- for (unsigned int i=2; i<args.size(); ++i)
- {
- depends.push_back(args[i]);
- }
- }
-
- // Hack together a utility target storing enough information
- // to reproduce the target inclusion.
- std::string utility_name("INCLUDE_EXTERNAL_MSPROJECT");
- utility_name += "_";
- utility_name += args[0];
std::string path = args[1];
cmSystemTools::ConvertToUnixSlashes(path);
--- 31,34 ----
***************
*** 52,65 ****
// Create a target instance for this utility.
cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY,
! utility_name.c_str());
target->SetProperty("EXCLUDE_FROM_ALL","FALSE");
! std::vector<std::string> no_outputs;
! cmCustomCommandLines commandLines;
! cmCustomCommandLine commandLine;
! commandLine.push_back(args[0]);
! commandLine.push_back(path);
! commandLines.push_back(commandLine);
! cmCustomCommand cc(no_outputs, depends, commandLines, 0, 0);
! target->GetPostBuildCommands().push_back(cc);
}
#endif
--- 36,46 ----
// Create a target instance for this utility.
cmTarget* target=this->Makefile->AddNewTarget(cmTarget::UTILITY,
! args[0].c_str());
! target->SetProperty("EXTERNAL_MSPROJECT", path.c_str());
target->SetProperty("EXCLUDE_FROM_ALL","FALSE");
! for (unsigned int i=2; i<args.size(); ++i)
! {
! target->AddUtility(args[i].c_str());
! }
}
#endif
Index: cmGlobalVisualStudio6Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** cmGlobalVisualStudio6Generator.h 28 Jun 2007 13:09:26 -0000 1.29
--- cmGlobalVisualStudio6Generator.h 14 Jul 2009 18:16:46 -0000 1.30
***************
*** 97,101 ****
void WriteExternalProject(std::ostream& fout,
const char* name, const char* path,
! const std::vector<std::string>& dependencies);
void WriteDSWFooter(std::ostream& fout);
};
--- 97,101 ----
void WriteExternalProject(std::ostream& fout,
const char* name, const char* path,
! const std::set<cmStdString>& dependencies);
void WriteDSWFooter(std::ostream& fout);
};
Index: cmVisualStudio10TargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmVisualStudio10TargetGenerator.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -C 2 -d -r1.11 -r1.12
*** cmVisualStudio10TargetGenerator.cxx 13 Jul 2009 20:58:24 -0000 1.11
--- cmVisualStudio10TargetGenerator.cxx 14 Jul 2009 18:16:46 -0000 1.12
***************
*** 39,56 ****
(cmLocalVisualStudio7Generator*)
this->Makefile->GetLocalGenerator();
! const char* name = this->Target->GetName();
! if (strncmp(name, "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
! {
! cmCustomCommand cc = this->Target->GetPostBuildCommands()[0];
! const cmCustomCommandLines& cmds = cc.GetCommandLines();
! this->Name = cmds[0][0];
! this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
! }
! else
! {
! this->Name = name;
! this->GlobalGenerator->CreateGUID(this->Name.c_str());
! this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
! }
this->Platform = "|Win32";
this->ComputeObjectNames();
--- 39,45 ----
(cmLocalVisualStudio7Generator*)
this->Makefile->GetLocalGenerator();
! this->Name = this->Target->GetName();
! this->GlobalGenerator->CreateGUID(this->Name.c_str());
! this->GUID = this->GlobalGenerator->GetGUID(this->Name.c_str());
this->Platform = "|Win32";
this->ComputeObjectNames();
***************
*** 115,119 ****
void cmVisualStudio10TargetGenerator::Generate()
! {
// Tell the global generator the name of the project file
this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
--- 104,113 ----
void cmVisualStudio10TargetGenerator::Generate()
! {
! // do not generate external ms projects
! if(this->Target->GetProperty("EXTERNAL_MSPROJECT"))
! {
! return;
! }
// Tell the global generator the name of the project file
this->Target->SetProperty("GENERATOR_FILE_NAME",this->Name.c_str());
***************
*** 1228,1231 ****
--- 1222,1230 ----
void cmVisualStudio10TargetGenerator::WriteProjectReferences()
{
+ // for static libs do not list references
+ if (this->Target->GetType() == cmTarget::STATIC_LIBRARY)
+ {
+ return;
+ }
cmGlobalGenerator::TargetDependSet& depends
= this->GlobalGenerator->GetTargetDirectDepends(*this->Target);
***************
*** 1239,1248 ****
std::string name = dt->GetName();
std::string path;
! if (strncmp(name.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
{
! cmCustomCommand cc = dt->GetPostBuildCommands()[0];
! const cmCustomCommandLines& cmds = cc.GetCommandLines();
! path = cmds[0][1];
! name = cmds[0][0].c_str();
}
else
--- 1238,1245 ----
std::string name = dt->GetName();
std::string path;
! const char* p = dt->GetProperty("EXTERNAL_MSPROJECT");
! if(p)
{
! path = p;
}
else
Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.106
retrieving revision 1.107
diff -C 2 -d -r1.106 -r1.107
*** cmGlobalVisualStudio7Generator.cxx 10 Jul 2009 13:12:28 -0000 1.106
--- cmGlobalVisualStudio7Generator.cxx 14 Jul 2009 18:16:46 -0000 1.107
***************
*** 251,260 ****
{
cmTarget* target = *tt;
! if (strncmp(target->GetName(), "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
{
! cmCustomCommand cc = target->GetPostBuildCommands()[0];
! const cmCustomCommandLines& cmds = cc.GetCommandLines();
! std::string project = cmds[0][0];
! this->WriteProjectConfigurations(fout, project.c_str(),
true);
}
--- 251,258 ----
{
cmTarget* target = *tt;
! const char* expath = target->GetProperty("EXTERNAL_MSPROJECT");
! if(expath)
{
! this->WriteProjectConfigurations(fout, target->GetName(),
true);
}
***************
*** 287,298 ****
cmTarget* target = *tt;
// handle external vc project files
! if (strncmp(target->GetName(), "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
! {
! cmCustomCommand cc = target->GetPostBuildCommands()[0];
! const cmCustomCommandLines& cmds = cc.GetCommandLines();
! std::string project = cmds[0][0];
! std::string location = cmds[0][1];
this->WriteExternalProject(fout, project.c_str(),
! location.c_str(), cc.GetDepends());
}
else
--- 285,295 ----
cmTarget* target = *tt;
// handle external vc project files
! const char* expath = target->GetProperty("EXTERNAL_MSPROJECT");
! if(expath)
! {
! std::string project = target->GetName();
! std::string location = expath;
this->WriteExternalProject(fout, project.c_str(),
! location.c_str(), target->GetUtilities());
}
else
***************
*** 341,383 ****
{
cmTarget* target = *tt;
! cmMakefile* mf = target->GetMakefile();
! if (strncmp(target->GetName(), "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
! {
! cmCustomCommand cc = target->GetPostBuildCommands()[0];
! const cmCustomCommandLines& cmds = cc.GetCommandLines();
! std::string name = cmds[0][0];
! std::vector<std::string> depends = cc.GetDepends();
! std::vector<std::string>::iterator iter;
! int depcount = 0;
! for(iter = depends.begin(); iter != depends.end(); ++iter)
! {
! std::string guid = this->GetGUID(iter->c_str());
! if(guid.size() == 0)
! {
! std::string m = "Target: ";
! m += target->GetName();
! m += " depends on unknown target: ";
! m += iter->c_str();
! cmSystemTools::Error(m.c_str());
! }
!
! fout << "\t\t{" << this->GetGUID(name.c_str())
! << "}." << depcount << " = {" << guid.c_str() << "}\n";
! depcount++;
! }
! }
! else
! {
! const char *vcprojName =
! target->GetProperty("GENERATOR_FILE_NAME");
! if (vcprojName)
! {
! std::string dir = mf->GetStartDirectory();
! this->WriteProjectDepends(fout, vcprojName,
! dir.c_str(), *target);
! }
}
}
}
// Write a SLN file to the stream
void cmGlobalVisualStudio7Generator
--- 338,353 ----
{
cmTarget* target = *tt;
! cmMakefile* mf = target->GetMakefile();
! const char *vcprojName =
! target->GetProperty("GENERATOR_FILE_NAME");
! if (vcprojName)
! {
! std::string dir = mf->GetStartDirectory();
! this->WriteProjectDepends(fout, vcprojName,
! dir.c_str(), *target);
}
}
}
+
// Write a SLN file to the stream
void cmGlobalVisualStudio7Generator
***************
*** 563,567 ****
const char* name,
const char* location,
! const std::vector<std::string>&)
{
std::string d = cmSystemTools::ConvertToOutputPath(location);
--- 533,537 ----
const char* name,
const char* location,
! const std::set<cmStdString>&)
{
std::string d = cmSystemTools::ConvertToOutputPath(location);
Index: cmGlobalVisualStudio7Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -C 2 -d -r1.48 -r1.49
*** cmGlobalVisualStudio7Generator.h 10 Jul 2009 13:12:29 -0000 1.48
--- cmGlobalVisualStudio7Generator.h 14 Jul 2009 18:16:46 -0000 1.49
***************
*** 143,147 ****
const char* name,
const char* path,
! const std::vector<std::string>&
dependencies);
--- 143,147 ----
const char* name,
const char* path,
! const std::set<cmStdString>&
dependencies);
Index: cmLocalVisualStudio10Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio10Generator.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmLocalVisualStudio10Generator.cxx 13 Jul 2009 20:58:24 -0000 1.3
--- cmLocalVisualStudio10Generator.cxx 14 Jul 2009 18:16:46 -0000 1.4
***************
*** 32,36 ****
if(this->DoGUID )
{
! this->GUID.assign(data, length);
this->DoGUID = false;
}
--- 32,36 ----
if(this->DoGUID )
{
! this->GUID.assign(data+1, length-2);
this->DoGUID = false;
}
***************
*** 113,117 ****
const char* path)
{
-
cmVS10XMLParser parser;
parser.ParseFile(path);
--- 113,116 ----
Index: cmGlobalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.cxx,v
retrieving revision 1.77
retrieving revision 1.78
diff -C 2 -d -r1.77 -r1.78
*** cmGlobalVisualStudio6Generator.cxx 10 Dec 2008 15:50:07 -0000 1.77
--- cmGlobalVisualStudio6Generator.cxx 14 Jul 2009 18:16:46 -0000 1.78
***************
*** 248,259 ****
}
// Write the project into the DSW file
! if (strncmp(l->first.c_str(), "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
{
! cmCustomCommand cc = l->second.GetPostBuildCommands()[0];
! const cmCustomCommandLines& cmds = cc.GetCommandLines();
! std::string project = cmds[0][0];
! std::string location = cmds[0][1];
this->WriteExternalProject(fout, project.c_str(),
! location.c_str(), cc.GetDepends());
}
else
--- 248,259 ----
}
// Write the project into the DSW file
! cmTarget* target = &l->second;
! const char* expath = target->GetProperty("EXTERNAL_MSPROJECT");
! if(expath)
{
! std::string project = target->GetName();
! std::string location = expath;
this->WriteExternalProject(fout, project.c_str(),
! location.c_str(), target->GetUtilities());
}
else
***************
*** 452,456 ****
const char* name,
const char* location,
! const std::vector<std::string>& dependencies)
{
fout << "#########################################################"
--- 452,456 ----
const char* name,
const char* location,
! const std::set<cmStdString>& dependencies)
{
fout << "#########################################################"
***************
*** 463,467 ****
! std::vector<std::string>::const_iterator i, end;
// write dependencies.
i = dependencies.begin();
--- 463,467 ----
! std::set<cmStdString>::const_iterator i, end;
// write dependencies.
i = dependencies.begin();
Index: cmGlobalVisualStudio71Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio71Generator.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C 2 -d -r1.18 -r1.19
*** cmGlobalVisualStudio71Generator.h 15 Feb 2008 16:49:58 -0000 1.18
--- cmGlobalVisualStudio71Generator.h 14 Jul 2009 18:16:46 -0000 1.19
***************
*** 73,77 ****
const char* name,
const char* path,
! const std::vector<std::string>& depends);
virtual void WriteSLNFooter(std::ostream& fout);
virtual void WriteSLNHeader(std::ostream& fout);
--- 73,77 ----
const char* name,
const char* path,
! const std::set<cmStdString>& depends);
virtual void WriteSLNFooter(std::ostream& fout);
virtual void WriteSLNHeader(std::ostream& fout);
Index: cmGlobalVisualStudioGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudioGenerator.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -C 2 -d -r1.15 -r1.16
*** cmGlobalVisualStudioGenerator.cxx 10 Jul 2009 13:12:32 -0000 1.15
--- cmGlobalVisualStudioGenerator.cxx 14 Jul 2009 18:16:46 -0000 1.16
***************
*** 377,393 ****
const char* name)
{
- // Handle the external MS project special case.
- if(strncmp(name, "INCLUDE_EXTERNAL_MSPROJECT", 26) == 0)
- {
- // Note from Ken:
- // kind of weird removing the first 27 letters. my
- // recommendatsions: use cmCustomCommand::GetCommand() to get the
- // project name or get rid of the target name starting with
- // "INCLUDE_EXTERNAL_MSPROJECT_" and use another indicator/flag
- // somewhere. These external project names shouldn't conflict
- // with cmake target names anyways.
- return name+27;
- }
-
// Possibly depend on an intermediate utility target to avoid
// linking.
--- 377,380 ----
More information about the Cmake-commits
mailing list