[cmake-commits] martink committed cmAddCustomTargetCommand.cxx 1.25
1.26 cmCPluginAPI.cxx 1.35 1.36
cmGlobalVisualStudio6Generator.cxx 1.64 1.65
cmGlobalVisualStudio7Generator.cxx 1.81 1.82
cmGlobalVisualStudio8Generator.cxx 1.17 1.18
cmGlobalXCodeGenerator.cxx 1.138 1.139 cmMakefile.cxx 1.377
1.378 cmMakefile.h 1.199 1.200
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Mar 13 14:18:29 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv4285/Source
Modified Files:
cmAddCustomTargetCommand.cxx cmCPluginAPI.cxx
cmGlobalVisualStudio6Generator.cxx
cmGlobalVisualStudio7Generator.cxx
cmGlobalVisualStudio8Generator.cxx cmGlobalXCodeGenerator.cxx
cmMakefile.cxx cmMakefile.h
Log Message:
ENH: some more cleanup
Index: cmGlobalVisualStudio8Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio8Generator.cxx,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- cmGlobalVisualStudio8Generator.cxx 12 Mar 2007 16:35:11 -0000 1.17
+++ cmGlobalVisualStudio8Generator.cxx 13 Mar 2007 19:18:27 -0000 1.18
@@ -91,7 +91,7 @@
cmMakefile* mf = lg->GetMakefile();
std::string cmake_command = mf->GetRequiredDefinition("CMAKE_COMMAND");
cmCustomCommandLines noCommandLines;
- mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, true,
+ mf->AddUtilityCommand(CMAKE_CHECK_BUILD_SYSTEM_TARGET, false,
no_working_directory, no_depends,
noCommandLines);
cmTarget* tgt = mf->FindTarget(CMAKE_CHECK_BUILD_SYSTEM_TARGET);
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -d -r1.138 -r1.139
--- cmGlobalXCodeGenerator.cxx 12 Mar 2007 15:32:10 -0000 1.138
+++ cmGlobalXCodeGenerator.cxx 13 Mar 2007 19:18:27 -0000 1.139
@@ -252,7 +252,7 @@
// Add ALL_BUILD
const char* no_working_directory = 0;
std::vector<std::string> no_depends;
- mf->AddUtilityCommand("ALL_BUILD", false, no_depends,
+ mf->AddUtilityCommand("ALL_BUILD", true, no_depends,
no_working_directory,
"echo", "Build all projects");
cmTarget* allbuild = mf->FindTarget("ALL_BUILD");
@@ -275,7 +275,7 @@
}
cmCustomCommandLines commandLines;
commandLines.push_back(makecommand);
- mf->AddUtilityCommand("XCODE_DEPEND_HELPER", false,
+ mf->AddUtilityCommand("XCODE_DEPEND_HELPER", true,
no_working_directory,
no_depends,
commandLines);
Index: cmAddCustomTargetCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmAddCustomTargetCommand.cxx,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- cmAddCustomTargetCommand.cxx 4 Oct 2006 22:10:29 -0000 1.25
+++ cmAddCustomTargetCommand.cxx 13 Mar 2007 19:18:27 -0000 1.26
@@ -73,13 +73,13 @@
tdoing doing = doing_command;
// Look for the ALL option.
- bool all = false;
+ bool excludeFromAll = true;
unsigned int start = 1;
if(args.size() > 1)
{
if(args[1] == "ALL")
{
- all = true;
+ excludeFromAll = false;
start = 2;
}
}
@@ -160,7 +160,7 @@
// Add the utility target to the makefile.
bool escapeOldStyle = !verbatim;
- this->Makefile->AddUtilityCommand(args[0].c_str(), all,
+ this->Makefile->AddUtilityCommand(args[0].c_str(), excludeFromAll,
working_directory.c_str(), depends,
commandLines, escapeOldStyle, comment);
Index: cmMakefile.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.h,v
retrieving revision 1.199
retrieving revision 1.200
diff -u -d -r1.199 -r1.200
--- cmMakefile.h 12 Mar 2007 14:26:59 -0000 1.199
+++ cmMakefile.h 13 Mar 2007 19:18:27 -0000 1.200
@@ -176,7 +176,7 @@
* Add a utility to the build. A utiltity target is a command that
* is run every time the target is built.
*/
- void AddUtilityCommand(const char* utilityName, bool all,
+ void AddUtilityCommand(const char* utilityName, bool excludeFromAll,
const std::vector<std::string>& depends,
const char* workingDirectory,
const char* command,
@@ -184,7 +184,7 @@
const char* arg2=0,
const char* arg3=0,
const char* arg4=0);
- void AddUtilityCommand(const char* utilityName, bool all,
+ void AddUtilityCommand(const char* utilityName, bool excludeFromAll,
const char* workingDirectory,
const std::vector<std::string>& depends,
const cmCustomCommandLines& commandLines,
Index: cmCPluginAPI.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmCPluginAPI.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- cmCPluginAPI.cxx 13 Dec 2006 17:19:58 -0000 1.35
+++ cmCPluginAPI.cxx 13 Mar 2007 19:18:27 -0000 1.36
@@ -236,7 +236,7 @@
}
// Pass the call to the makefile instance.
- mf->AddUtilityCommand(utilityName, (all ? true : false),
+ mf->AddUtilityCommand(utilityName, (all ? false : true),
0, depends2, commandLines);
}
void CCONV cmAddCustomCommand(void *arg, const char* source,
Index: cmGlobalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio6Generator.cxx,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- cmGlobalVisualStudio6Generator.cxx 12 Mar 2007 14:26:59 -0000 1.64
+++ cmGlobalVisualStudio6Generator.cxx 13 Mar 2007 19:18:27 -0000 1.65
@@ -171,7 +171,7 @@
// add the ALL_BUILD to the first local generator of each project
if(gen.size())
{
- gen[0]->GetMakefile()->AddUtilityCommand("ALL_BUILD", false,
+ gen[0]->GetMakefile()->AddUtilityCommand("ALL_BUILD", true,
no_depends,
no_working_dir,
"echo", "Build all projects");
Index: cmGlobalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalVisualStudio7Generator.cxx,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- cmGlobalVisualStudio7Generator.cxx 12 Mar 2007 16:35:11 -0000 1.81
+++ cmGlobalVisualStudio7Generator.cxx 13 Mar 2007 19:18:27 -0000 1.82
@@ -226,7 +226,7 @@
if(gen.size())
{
gen[0]->GetMakefile()->
- AddUtilityCommand("ALL_BUILD", false, no_depends,
+ AddUtilityCommand("ALL_BUILD", true, no_depends,
no_working_dir,
"echo", "Build all projects");
std::string cmake_command =
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.377
retrieving revision 1.378
diff -u -d -r1.377 -r1.378
--- cmMakefile.cxx 13 Mar 2007 18:23:08 -0000 1.377
+++ cmMakefile.cxx 13 Mar 2007 19:18:27 -0000 1.378
@@ -771,7 +771,8 @@
}
//----------------------------------------------------------------------------
-void cmMakefile::AddUtilityCommand(const char* utilityName, bool all,
+void cmMakefile::AddUtilityCommand(const char* utilityName,
+ bool excludeFromAll,
const std::vector<std::string>& depends,
const char* workingDirectory,
const char* command,
@@ -803,12 +804,13 @@
commandLines.push_back(commandLine);
// Call the real signature of this method.
- this->AddUtilityCommand(utilityName, all, workingDirectory,
+ this->AddUtilityCommand(utilityName, excludeFromAll, workingDirectory,
depends, commandLines);
}
//----------------------------------------------------------------------------
-void cmMakefile::AddUtilityCommand(const char* utilityName, bool all,
+void cmMakefile::AddUtilityCommand(const char* utilityName,
+ bool excludeFromAll,
const char* workingDirectory,
const std::vector<std::string>& depends,
const cmCustomCommandLines& commandLines,
@@ -818,8 +820,10 @@
cmTarget target;
target.SetMakefile(this);
target.SetType(cmTarget::UTILITY, utilityName);
- target.SetProperty("EXCLUDE_FROM_ALL", (all) ?"FALSE" : "TRUE");
-
+ if (excludeFromAll)
+ {
+ target.SetProperty("EXCLUDE_FROM_ALL", "TRUE");
+ }
if(!comment)
{
// Use an empty comment to avoid generation of default comment.
More information about the Cmake-commits
mailing list