[cmake-commits] martink committed cmAddExecutableCommand.cxx 1.28
1.29 cmAddLibraryCommand.cxx 1.27 1.28
cmAddSubDirectoryCommand.cxx 1.9 1.10 cmGlobalGenerator.cxx
1.169 1.170 cmGlobalUnixMakefileGenerator3.cxx 1.100 1.101
cmGlobalVisualStudio6Generator.cxx 1.63 1.64
cmGlobalVisualStudio71Generator.cxx 1.35 1.36
cmGlobalVisualStudio7Generator.cxx 1.79 1.80
cmIncludeExternalMSProjectCommand.cxx 1.17 1.18
cmInstallFilesCommand.cxx 1.23 1.24
cmInstallProgramsCommand.cxx 1.16 1.17 cmLocalGenerator.cxx
1.200 1.201 cmLocalGenerator.h 1.76 1.77 cmMakefile.cxx 1.375
1.376 cmMakefile.h 1.198 1.199 cmSubdirCommand.cxx 1.17 1.18
cmTarget.h 1.77 1.78
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Mar 12 09:27:02 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv6317/Source
Modified Files:
cmAddExecutableCommand.cxx cmAddLibraryCommand.cxx
cmAddSubDirectoryCommand.cxx cmGlobalGenerator.cxx
cmGlobalUnixMakefileGenerator3.cxx
cmGlobalVisualStudio6Generator.cxx
cmGlobalVisualStudio71Generator.cxx
cmGlobalVisualStudio7Generator.cxx
cmIncludeExternalMSProjectCommand.cxx
cmInstallFilesCommand.cxx cmInstallProgramsCommand.cxx
cmLocalGenerator.cxx cmLocalGenerator.h cmMakefile.cxx
cmMakefile.h cmSubdirCommand.cxx cmTarget.h
Log Message:
ENH: some code cleanup
Index: cmLocalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.cxx,v
retrieving revision 1.200
retrieving revision 1.201
diff -u -d -r1.200 -r1.201
--- cmLocalGenerator.cxx 9 Mar 2007 22:15:13 -0000 1.200
+++ cmLocalGenerator.cxx 12 Mar 2007 14:26:59 -0000 1.201
@@ -409,7 +409,7 @@
for(std::vector<cmLocalGenerator*>::const_iterator
ci = this->Children.begin(); ci != this->Children.end(); ++ci)
{
- if(!(*ci)->GetExcludeAll())
+ if(!(*ci)->GetMakefile()->GetProperty("EXCLUDE_FROM_ALL"))
{
std::string odir = (*ci)->GetMakefile()->GetStartOutputDirectory();
cmSystemTools::ConvertToUnixSlashes(odir);
@@ -2610,13 +2610,3 @@
{
return sf.GetSourceName();
}
-
-bool cmLocalGenerator::GetExcludeAll()
-{
- return this->Makefile->GetPropertyAsBool("EXCLUDE_FROM_ALL");
-}
-
-void cmLocalGenerator::SetExcludeAll(bool b)
-{
- this->Makefile->SetProperty("EXCLUDE_FROM_ALL", b?"TRUE":"FALSE");
-}
Index: cmLocalGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalGenerator.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- cmLocalGenerator.h 8 Mar 2007 13:38:40 -0000 1.76
+++ cmLocalGenerator.h 12 Mar 2007 14:26:59 -0000 1.77
@@ -110,10 +110,6 @@
*/
std::string ConvertToOptionallyRelativeOutputPath(const char* remote);
- // flag to determine if this project should be included in a parent project
- bool GetExcludeAll();
- void SetExcludeAll(bool b);
-
///! set/get the parent generator
cmLocalGenerator* GetParent(){return this->Parent;}
void SetParent(cmLocalGenerator* g) { this->Parent = g; g->AddChild(this); }
Index: cmInstallProgramsCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallProgramsCommand.cxx,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- cmInstallProgramsCommand.cxx 7 Dec 2006 14:44:45 -0000 1.16
+++ cmInstallProgramsCommand.cxx 12 Mar 2007 14:26:59 -0000 1.17
@@ -35,7 +35,7 @@
cmTarget& target = this->Makefile->GetTargets()[this->TargetName];
target.SetType(cmTarget::INSTALL_PROGRAMS, this->TargetName.c_str());
target.SetMakefile(this->Makefile);
- target.SetInAll(false);
+ target.SetProperty("EXCLUDE_FROM_ALL","TRUE");
target.SetInstallPath(args[0].c_str());
std::vector<std::string>::const_iterator s = args.begin();
Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- cmGlobalUnixMakefileGenerator3.cxx 8 Mar 2007 16:10:21 -0000 1.100
+++ cmGlobalUnixMakefileGenerator3.cxx 12 Mar 2007 14:26:59 -0000 1.101
@@ -229,7 +229,7 @@
cmLocalGenerator *lg3 = lg;
while (lg3)
{
- if (lg3->GetExcludeAll())
+ if (lg3->GetMakefile()->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
exclude = true;
break;
@@ -478,7 +478,7 @@
(l->second.GetType() == cmTarget::UTILITY))
{
// Add this to the list of depends rules in this directory.
- if((!check_all || l->second.IsInAll()) &&
+ if((!check_all || !l->second.GetPropertyAsBool("EXCLUDE_FROM_ALL")) &&
(!check_relink || l->second.NeedRelinkBeforeInstall()))
{
std::string tname = lg->GetRelativeTargetDirectory(l->second);
@@ -790,7 +790,7 @@
localName.c_str(), depends, commands, true);
// add the all/all dependency
- if (!exclude && t->second.IsInAll())
+ if (!exclude && !t->second.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
depends.clear();
depends.push_back(localName);
@@ -937,7 +937,7 @@
(t->second.GetType() == cmTarget::MODULE_LIBRARY) ||
(t->second.GetType() == cmTarget::UTILITY))
{
- if (t->second.IsInAll())
+ if (!t->second.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
std::vector<int> &progFiles = lg3->ProgressFiles[t->first];
result += static_cast<unsigned long>(progFiles.size());
@@ -966,7 +966,7 @@
(l->second.GetType() == cmTarget::UTILITY))
{
// Add this to the list of depends rules in this directory.
- if (l->second.IsInAll() &&
+ if (!l->second.GetPropertyAsBool("EXCLUDE_FROM_ALL") &&
targets.find(&l->second) == targets.end())
{
std::deque<cmTarget *> activeTgts;
Index: cmAddLibraryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddLibraryCommand.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmAddLibraryCommand.cxx 4 Jan 2007 21:03:41 -0000 1.27
+++ cmAddLibraryCommand.cxx 12 Mar 2007 14:26:59 -0000 1.28
@@ -28,7 +28,7 @@
// otherwise it defaults to static library.
int shared =
!cmSystemTools::IsOff(this->Makefile->GetDefinition("BUILD_SHARED_LIBS"));
- bool in_all = true;
+ bool excludeFromAll = false;
std::vector<std::string>::const_iterator s = args.begin();
@@ -60,7 +60,7 @@
else if(*s == "EXCLUDE_FROM_ALL")
{
++s;
- in_all = false;
+ excludeFromAll = true;
}
else
{
@@ -85,7 +85,7 @@
}
this->Makefile->AddLibrary(this->LibName.c_str(), shared, srclists,
- in_all);
+ excludeFromAll);
return true;
}
Index: cmGlobalVisualStudio71Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio71Generator.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- cmGlobalVisualStudio71Generator.cxx 9 Nov 2006 14:57:23 -0000 1.35
+++ cmGlobalVisualStudio71Generator.cxx 12 Mar 2007 14:26:59 -0000 1.36
@@ -109,7 +109,7 @@
for(cmTargets::iterator al = atgts.begin();
al != atgts.end(); ++al)
{
- if (al->second.IsInAll())
+ if (!al->second.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
if (al->second.GetType() == cmTarget::UTILITY ||
al->second.GetType() == cmTarget::GLOBAL_TARGET)
Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- cmMakefile.h 7 Dec 2006 14:44:45 -0000 1.198
+++ cmMakefile.h 12 Mar 2007 14:26:59 -0000 1.199
@@ -170,7 +170,7 @@
*/
cmTarget* AddExecutable(const char *exename,
const std::vector<std::string> &srcs,
- bool in_all = true);
+ bool excludeFromAll = false);
/**
* Add a utility to the build. A utiltity target is a command that
@@ -224,10 +224,10 @@
/**
* Add a subdirectory to the build.
*/
- void AddSubDirectory(const char*, bool includeTopLevel=true,
+ void AddSubDirectory(const char*, bool excludeFromAll=false,
bool preorder = false);
void AddSubDirectory(const char* fullSrcDir,const char *fullBinDir,
- bool includeTopLevel, bool preorder,
+ bool excludeFromAll, bool preorder,
bool immediate);
/**
@@ -281,7 +281,7 @@
*/
void AddLibrary(const char *libname, int shared,
const std::vector<std::string> &srcs,
- bool in_all = true);
+ bool excludeFromAll = false);
#if defined(CMAKE_BUILD_WITH_CMAKE)
/**
Index: cmIncludeExternalMSProjectCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIncludeExternalMSProjectCommand.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmIncludeExternalMSProjectCommand.cxx 28 Sep 2006 21:35:24 -0000 1.17
+++ cmIncludeExternalMSProjectCommand.cxx 12 Mar 2007 14:26:59 -0000 1.18
@@ -52,7 +52,7 @@
// Create a target instance for this utility.
cmTarget target;
target.SetType(cmTarget::UTILITY, utility_name.c_str());
- target.SetInAll(true);
+ target.SetProperty("EXCLUDE_FROM_ALL","FALSE");
target.SetMakefile(this->Makefile);
std::vector<std::string> no_outputs;
cmCustomCommandLines commandLines;
Index: cmAddSubDirectoryCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddSubDirectoryCommand.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- cmAddSubDirectoryCommand.cxx 31 Aug 2006 20:40:38 -0000 1.9
+++ cmAddSubDirectoryCommand.cxx 12 Mar 2007 14:26:59 -0000 1.10
@@ -30,7 +30,7 @@
std::string srcArg = args[0];
std::string binArg;
- bool intoplevel = true;
+ bool excludeFromAll = false;
// process the rest of the arguments looking for optional args
std::vector<std::string>::const_iterator i = args.begin();
@@ -39,7 +39,7 @@
{
if(*i == "EXCLUDE_FROM_ALL")
{
- intoplevel = false;
+ excludeFromAll = true;
continue;
}
else if (!binArg.size())
@@ -122,7 +122,7 @@
// Add the subdirectory using the computed full paths.
this->Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(),
- intoplevel, false, true);
+ excludeFromAll, false, true);
return true;
}
Index: cmTarget.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- cmTarget.h 9 Mar 2007 20:14:27 -0000 1.77
+++ cmTarget.h 12 Mar 2007 14:26:59 -0000 1.78
@@ -57,14 +57,6 @@
///! Set/Get the name of the target
const char* GetName() {return this->Name.c_str();}
- /**
- * Indicate whether the target is part of the all target
- */
- bool IsInAll() { return !this->GetPropertyAsBool("EXCLUDE_FROM_ALL"); }
- bool GetInAll() { return !this->GetPropertyAsBool("EXCLUDE_FROM_ALL"); }
- void SetInAll(bool f) {
- this->SetProperty("EXCLUDE_FROM_ALL", (f) ?"FALSE" : "TRUE"); }
-
///! Set the cmMakefile that owns this target
void SetMakefile(cmMakefile *mf);
cmMakefile *GetMakefile() { return this->Makefile;};
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -d -r1.169 -r1.170
--- cmGlobalGenerator.cxx 7 Mar 2007 20:15:45 -0000 1.169
+++ cmGlobalGenerator.cxx 12 Mar 2007 14:26:59 -0000 1.170
@@ -1006,13 +1006,13 @@
cmLocalGenerator* cur = gen->GetParent();
while(cur && cur != root)
{
- if(cur->GetExcludeAll())
+ if(cur->GetMakefile()->GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
return true;
}
cur = cur->GetParent();
}
- return gen->GetExcludeAll();
+ return gen->GetMakefile()->GetPropertyAsBool("EXCLUDE_FROM_ALL");
}
@@ -1359,7 +1359,7 @@
cmTarget target;
target.GetProperties().SetCMakeInstance(this->CMakeInstance);
target.SetType(cmTarget::GLOBAL_TARGET, name);
- target.SetInAll(false);
+ target.SetProperty("EXCLUDE_FROM_ALL","TRUE");
std::vector<std::string> no_outputs;
std::vector<std::string> no_depends;
Index: cmGlobalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.cxx,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- cmGlobalVisualStudio6Generator.cxx 5 Mar 2007 18:01:02 -0000 1.63
+++ cmGlobalVisualStudio6Generator.cxx 12 Mar 2007 14:26:59 -0000 1.64
@@ -247,7 +247,7 @@
for(cmTargets::iterator al = atgts.begin();
al != atgts.end(); ++al)
{
- if (al->second.IsInAll())
+ if (!al->second.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
if (al->second.GetType() == cmTarget::UTILITY ||
al->second.GetType() == cmTarget::GLOBAL_TARGET)
Index: cmInstallFilesCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallFilesCommand.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmInstallFilesCommand.cxx 7 Dec 2006 14:44:45 -0000 1.23
+++ cmInstallFilesCommand.cxx 12 Mar 2007 14:26:59 -0000 1.24
@@ -38,7 +38,7 @@
cmTarget& target = this->Makefile->GetTargets()[this->TargetName];
target.SetType(cmTarget::INSTALL_FILES, this->TargetName.c_str());
target.SetMakefile(this->Makefile);
- target.SetInAll(false);
+ target.SetProperty("EXCLUDE_FROM_ALL","TRUE");
target.SetInstallPath(args[0].c_str());
if((args.size() > 1) && (args[1] == "FILES"))
Index: cmAddExecutableCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddExecutableCommand.cxx,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- cmAddExecutableCommand.cxx 2 Oct 2006 16:01:19 -0000 1.28
+++ cmAddExecutableCommand.cxx 12 Mar 2007 14:26:59 -0000 1.29
@@ -31,7 +31,7 @@
++s;
bool use_win32 = false;
bool use_macbundle = false;
- bool in_all = true;
+ bool excludeFromAll = false;
while ( s != args.end() )
{
if (*s == "WIN32")
@@ -47,7 +47,7 @@
else if(*s == "EXCLUDE_FROM_ALL")
{
++s;
- in_all = false;
+ excludeFromAll = true;
}
else
{
@@ -64,7 +64,7 @@
std::vector<std::string> srclists(s, args.end());
cmTarget* tgt = this->Makefile->AddExecutable(exename.c_str(), srclists,
- in_all);
+ excludeFromAll);
if ( use_win32 )
{
tgt->SetProperty("WIN32_EXECUTABLE", "ON");
Index: cmSubdirCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSubdirCommand.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmSubdirCommand.cxx 12 May 2006 17:53:21 -0000 1.17
+++ cmSubdirCommand.cxx 12 Mar 2007 14:26:59 -0000 1.18
@@ -25,7 +25,7 @@
return false;
}
bool res = true;
- bool intoplevel = true;
+ bool excludeFromAll = false;
bool preorder = false;
for(std::vector<std::string>::const_iterator i = args.begin();
@@ -33,7 +33,7 @@
{
if(*i == "EXCLUDE_FROM_ALL")
{
- intoplevel = false;
+ excludeFromAll = true;
continue;
}
if(*i == "PREORDER")
@@ -52,7 +52,7 @@
std::string(this->Makefile->GetCurrentOutputDirectory()) +
"/" + i->c_str();
this->Makefile->AddSubDirectory(srcPath.c_str(), binPath.c_str(),
- intoplevel, preorder, false);
+ excludeFromAll, preorder, false);
}
// otherwise it is a full path
else if ( cmSystemTools::FileIsDirectory(i->c_str()) )
@@ -63,7 +63,7 @@
std::string(this->Makefile->GetCurrentOutputDirectory()) +
"/" + cmSystemTools::GetFilenameName(i->c_str());
this->Makefile->AddSubDirectory(i->c_str(), binPath.c_str(),
- intoplevel, preorder, false);
+ excludeFromAll, preorder, false);
}
else
{
Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- cmGlobalVisualStudio7Generator.cxx 5 Mar 2007 18:01:02 -0000 1.79
+++ cmGlobalVisualStudio7Generator.cxx 12 Mar 2007 14:26:59 -0000 1.80
@@ -339,7 +339,7 @@
for(cmTargets::iterator al = atgts.begin();
al != atgts.end(); ++al)
{
- if (al->second.IsInAll())
+ if (!al->second.GetPropertyAsBool("EXCLUDE_FROM_ALL"))
{
if (al->second.GetType() == cmTarget::UTILITY ||
al->second.GetType() == cmTarget::GLOBAL_TARGET)
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -d -r1.375 -r1.376
--- cmMakefile.cxx 7 Mar 2007 16:03:57 -0000 1.375
+++ cmMakefile.cxx 12 Mar 2007 14:26:59 -0000 1.376
@@ -818,7 +818,7 @@
cmTarget target;
target.SetMakefile(this);
target.SetType(cmTarget::UTILITY, utilityName);
- target.SetInAll(all);
+ target.SetProperty("EXCLUDE_FROM_ALL", (all) ?"FALSE" : "TRUE");
if(!comment)
{
@@ -1066,7 +1066,7 @@
}
void cmMakefile::AddSubDirectory(const char* sub,
- bool topLevel, bool preorder)
+ bool excludeFromAll, bool preorder)
{
// the source path must be made full if it isn't already
std::string srcPath = sub;
@@ -1088,12 +1088,12 @@
this->AddSubDirectory(srcPath.c_str(), binPath.c_str(),
- topLevel, preorder, false);
+ excludeFromAll, preorder, false);
}
void cmMakefile::AddSubDirectory(const char* srcPath, const char *binPath,
- bool topLevel, bool preorder,
+ bool excludeFromAll, bool preorder,
bool immediate)
{
std::vector<cmLocalGenerator *>& children =
@@ -1120,7 +1120,8 @@
// set the subdirs start dirs
lg2->GetMakefile()->SetStartDirectory(srcPath);
lg2->GetMakefile()->SetStartOutputDirectory(binPath);
- lg2->SetExcludeAll(!topLevel);
+ lg2->GetMakefile()->SetProperty("EXCLUDE_FROM_ALL",
+ (excludeFromAll) ? "TRUE" : "FALSE");
lg2->GetMakefile()->SetPreOrder(preorder);
if (immediate)
@@ -1318,7 +1319,7 @@
void cmMakefile::AddLibrary(const char* lname, int shared,
const std::vector<std::string> &srcs,
- bool in_all)
+ bool excludeFromAll)
{
cmTarget target;
switch (shared)
@@ -1341,7 +1342,8 @@
// over changes in CMakeLists.txt, making the information stale and
// hence useless.
target.ClearDependencyInformation( *this, lname );
- target.SetInAll(in_all);
+ target.SetProperty("EXCLUDE_FROM_ALL",
+ (excludeFromAll) ? "TRUE" : "FALSE");
target.GetSourceLists() = srcs;
this->AddGlobalLinkInformation(lname, target);
cmTargets::iterator it =
@@ -1351,12 +1353,13 @@
cmTarget* cmMakefile::AddExecutable(const char *exeName,
const std::vector<std::string> &srcs,
- bool in_all)
+ bool excludeFromAll)
{
cmTarget target;
target.SetType(cmTarget::EXECUTABLE, exeName);
target.SetMakefile(this);
- target.SetInAll(in_all);
+ target.SetProperty("EXCLUDE_FROM_ALL",
+ (excludeFromAll) ?"TRUE" : "FALSE");
target.GetSourceLists() = srcs;
this->AddGlobalLinkInformation(exeName, target);
cmTargets::iterator it =
More information about the Cmake-commits
mailing list