[cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.177 1.178
cmLocalVisualStudio6Generator.cxx 1.134 1.135
cmLocalVisualStudio7Generator.cxx 1.211 1.212
cmMakefileTargetGenerator.cxx 1.83 1.84 cmSourceFile.cxx 1.42
1.43 cmTarget.cxx 1.174 1.175
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Jan 15 21:02:02 EST 2008
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv20659/Source
Modified Files:
cmGlobalXCodeGenerator.cxx cmLocalVisualStudio6Generator.cxx
cmLocalVisualStudio7Generator.cxx
cmMakefileTargetGenerator.cxx cmSourceFile.cxx cmTarget.cxx
Log Message:
ENH: Renamed <CONFIG>_COMPILE_DEFINITIONS to COMPILE_DEFINITIONS_<CONFIG> for better documentation clarity.
Index: cmLocalVisualStudio7Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio7Generator.cxx,v
retrieving revision 1.211
retrieving revision 1.212
diff -u -d -r1.211 -r1.212
--- cmLocalVisualStudio7Generator.cxx 14 Jan 2008 14:20:57 -0000 1.211
+++ cmLocalVisualStudio7Generator.cxx 16 Jan 2008 02:02:00 -0000 1.212
@@ -521,8 +521,8 @@
}
std::string configUpper = cmSystemTools::UpperCase(configName);
- std::string defPropName = configUpper;
- defPropName += "_COMPILE_DEFINITIONS";
+ std::string defPropName = "COMPILE_DEFINITIONS_";
+ defPropName += configUpper;
// Get preprocessor definitions for this directory.
std::string defineFlags = this->Makefile->GetDefineFlags();
@@ -1093,8 +1093,8 @@
fc.CompileDefs = cdefs;
needfc = true;
}
- std::string defPropName = configUpper;
- defPropName += "_COMPILE_DEFINITIONS";
+ std::string defPropName = "COMPILE_DEFINITIONS_";
+ defPropName += configUpper;
if(const char* ccdefs = sf.GetProperty(defPropName.c_str()))
{
fc.CompileDefsConfig = ccdefs;
Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- cmGlobalXCodeGenerator.cxx 14 Jan 2008 16:07:05 -0000 1.177
+++ cmGlobalXCodeGenerator.cxx 16 Jan 2008 02:02:00 -0000 1.178
@@ -1303,8 +1303,8 @@
this->AppendDefines(ppDefs, target.GetProperty("COMPILE_DEFINITIONS"));
if(configName)
{
- std::string defVarName = cmSystemTools::UpperCase(configName);
- defVarName += "_COMPILE_DEFINITIONS";
+ std::string defVarName = "COMPILE_DEFINITIONS_";
+ defVarName += cmSystemTools::UpperCase(configName);
this->AppendDefines(ppDefs, target.GetProperty(defVarName.c_str()));
}
buildSettings->AddAttribute
Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- cmLocalVisualStudio6Generator.cxx 14 Jan 2008 14:20:57 -0000 1.134
+++ cmLocalVisualStudio6Generator.cxx 16 Jan 2008 02:02:00 -0000 1.135
@@ -417,21 +417,21 @@
std::map<cmStdString, cmStdString> cdmap;
this->AppendDefines(compileFlags,
(*sf)->GetProperty("COMPILE_DEFINITIONS"));
- if(const char* cdefs = (*sf)->GetProperty("DEBUG_COMPILE_DEFINITIONS"))
+ if(const char* cdefs = (*sf)->GetProperty("COMPILE_DEFINITIONS_DEBUG"))
{
this->AppendDefines(cdmap["DEBUG"], cdefs);
}
- if(const char* cdefs = (*sf)->GetProperty("RELEASE_COMPILE_DEFINITIONS"))
+ if(const char* cdefs = (*sf)->GetProperty("COMPILE_DEFINITIONS_RELEASE"))
{
this->AppendDefines(cdmap["RELEASE"], cdefs);
}
if(const char* cdefs =
- (*sf)->GetProperty("MINSIZEREL_COMPILE_DEFINITIONS"))
+ (*sf)->GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"))
{
this->AppendDefines(cdmap["MINSIZEREL"], cdefs);
}
if(const char* cdefs =
- (*sf)->GetProperty("RELWITHDEBINFO_COMPILE_DEFINITIONS"))
+ (*sf)->GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"))
{
this->AppendDefines(cdmap["RELWITHDEBINFO"], cdefs);
}
@@ -1505,15 +1505,15 @@
// Add per-target and per-configuration preprocessor definitions.
this->AppendDefines(flags, target.GetProperty("COMPILE_DEFINITIONS"));
this->AppendDefines(flagsDebug,
- target.GetProperty("DEBUG_COMPILE_DEFINITIONS"));
+ target.GetProperty("COMPILE_DEFINITIONS_DEBUG"));
this->AppendDefines(flagsRelease,
- target.GetProperty("RELEASE_COMPILE_DEFINITIONS"));
+ target.GetProperty("COMPILE_DEFINITIONS_RELEASE"));
this->AppendDefines
(flagsMinSize,
- target.GetProperty("MINSIZEREL_COMPILE_DEFINITIONS"));
+ target.GetProperty("COMPILE_DEFINITIONS_MINSIZEREL"));
this->AppendDefines
(flagsDebugRel,
- target.GetProperty("RELWITHDEBINFO_COMPILE_DEFINITIONS"));
+ target.GetProperty("COMPILE_DEFINITIONS_RELWITHDEBINFO"));
// The template files have CXX FLAGS in them, that need to be replaced.
// There are not separate CXX and C template files, so we use the same
Index: cmSourceFile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSourceFile.cxx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- cmSourceFile.cxx 15 Jan 2008 15:49:22 -0000 1.42
+++ cmSourceFile.cxx 16 Jan 2008 02:02:00 -0000 1.43
@@ -345,15 +345,15 @@
cm->DefineProperty
("COMPILE_DEFINITIONS", cmProperty::SOURCE_FILE,
- "Preprocessor definitions for compiling this source file.",
+ "Preprocessor definitions for compiling a source file.",
"The COMPILE_DEFINITIONS property may be set to a list of preprocessor "
"definitions using the syntax VAR or VAR=value. Function-style "
"definitions are not supported. CMake will automatically escape "
"the value correctly for the native build system (note that CMake "
"language syntax may require escapes to specify some values). "
"This property may be set on a per-configuration basis using the name "
- "<CONFIG>_COMPILE_DEFINITIONS where <CONFIG> is an upper-case name "
- "(ex. \"DEBUG_COMPILE_DEFINITIONS\").\n"
+ "COMPILE_DEFINITIONS_<CONFIG> where <CONFIG> is an upper-case name "
+ "(ex. \"COMPILE_DEFINITIONS_DEBUG\").\n"
"CMake will automatically drop some definitions that "
"are not supported by the native build tool. "
"The VS6 IDE does not support definitions with values "
@@ -370,12 +370,12 @@
cm->DefineProperty
- ("<CONFIG>_COMPILE_DEFINITIONS", cmProperty::SOURCE_FILE,
+ ("COMPILE_DEFINITIONS_<CONFIG>", cmProperty::SOURCE_FILE,
"Per-configuration preprocessor definitions on a source file.",
"This is the configuration-specific version of "
"COMPILE_DEFINITIONS. Note that Xcode does not support "
"per-configuration source file flags so this property will "
- "be ignored by the Xcode generator.");
+ "be ignored by the Xcode generator.");
cm->DefineProperty
("EXTERNAL_OBJECT", cmProperty::SOURCE_FILE,
Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -d -r1.83 -r1.84
--- cmMakefileTargetGenerator.cxx 14 Jan 2008 14:20:57 -0000 1.83
+++ cmMakefileTargetGenerator.cxx 16 Jan 2008 02:02:00 -0000 1.84
@@ -268,9 +268,9 @@
// Add preprocessor definitions for this target and configuration.
this->LocalGenerator->AppendDefines
(defines, this->Target->GetProperty("COMPILE_DEFINITIONS"));
- std::string defPropName =
+ std::string defPropName = "COMPILE_DEFINITIONS_";
+ defPropName +=
cmSystemTools::UpperCase(this->LocalGenerator->ConfigurationName);
- defPropName += "_COMPILE_DEFINITIONS";
this->LocalGenerator->AppendDefines
(defines, this->Target->GetProperty(defPropName.c_str()));
@@ -464,8 +464,8 @@
}
std::string configUpper =
cmSystemTools::UpperCase(this->LocalGenerator->ConfigurationName);
- std::string defPropName = configUpper;
- defPropName += "_COMPILE_DEFINITIONS";
+ std::string defPropName = "COMPILE_DEFINITIONS_";
+ defPropName += configUpper;
if(const char* config_compile_defs =
source.GetProperty(defPropName.c_str()))
{
Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- cmTarget.cxx 15 Jan 2008 15:49:22 -0000 1.174
+++ cmTarget.cxx 16 Jan 2008 02:02:00 -0000 1.175
@@ -72,15 +72,15 @@
cm->DefineProperty
("COMPILE_DEFINITIONS", cmProperty::TARGET,
- "Preprocessor definitions for compiling this target's sources.",
+ "Preprocessor definitions for compiling a target's sources.",
"The COMPILE_DEFINITIONS property may be set to a list of preprocessor "
"definitions using the syntax VAR or VAR=value. Function-style "
"definitions are not supported. CMake will automatically escape "
"the value correctly for the native build system (note that CMake "
"language syntax may require escapes to specify some values). "
"This property may be set on a per-configuration basis using the name "
- "<CONFIG>_COMPILE_DEFINITIONS where <CONFIG> is an upper-case name "
- "(ex. \"DEBUG_COMPILE_DEFINITIONS\").\n"
+ "COMPILE_DEFINITIONS_<CONFIG> where <CONFIG> is an upper-case name "
+ "(ex. \"COMPILE_DEFINITIONS_DEBUG\").\n"
"CMake will automatically drop some definitions that "
"are not supported by the native build tool. "
"The VS6 IDE does not support definitions with values "
@@ -95,7 +95,7 @@
"in a (configured) header file. Then report the limitation.");
cm->DefineProperty
- ("<CONFIG>_COMPILE_DEFINITIONS", cmProperty::TARGET,
+ ("COMPILE_DEFINITIONS_<CONFIG>", cmProperty::TARGET,
"Per-configuration preprocessor definitions on a target.",
"This is the configuration-specific version of COMPILE_DEFINITIONS.");
More information about the Cmake-commits
mailing list