kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: fix accidental checkin

This commit is contained in:
Ken Martin 2007-02-19 14:32:36 -05:00
parent 3e82b9ee51
commit 84315a7d57
2 changed files with 6 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/cmTarget.cxx
View File

@ -232,12 +232,6 @@ void cmTarget::DefineProperties(cmake *cm)
"A target property that can be set to override the suffix " "A target property that can be set to override the suffix "
"(such as \".so\") on a library name."); "(such as \".so\") on a library name.");
cm->DefineProperty
("TEST_LOCATION", cmProperty::TARGET,
"Where a target will be written on disk for ctest.",
"Much like the LOCATION property but makes use of "
"CTEST_TEST_CONFIGURATION to handle the build configuration.");
cm->DefineProperty cm->DefineProperty
("VERSION", cmProperty::TARGET, ("VERSION", cmProperty::TARGET,
"What version number is this target.", "What version number is this target.",
@ -1153,25 +1147,6 @@ const char* cmTarget::GetLocation(const char* config)
return this->Location.c_str(); return this->Location.c_str();
} }
const char* cmTarget::GetTestLocation(const char* config)
{
this->Location = this->GetDirectory();
if(!this->Location.empty())
{
this->Location += "/";
}
const char* cfgid = this->Makefile->GetDefinition("CMAKE_CFG_INTDIR");
// if this platform has configurations, then use the ctest var
if(cfgid && strcmp(cfgid, ".") != 0)
{
this->Location += "${CTEST_CONFIGURATION_TYPE}";
this->Location += "/";
}
this->Location += this->GetFullName(config, false);
return this->Location.c_str();
}
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmTarget::GetTargetVersion(int& major, int& minor) void cmTarget::GetTargetVersion(int& major, int& minor)
{ {
@ -1263,30 +1238,6 @@ const char *cmTarget::GetProperty(const char* prop,
this->SetProperty("LOCATION", this->GetLocation(0)); this->SetProperty("LOCATION", this->GetLocation(0));
} }
if (!strcmp(prop,"TEST_LOCATION"))
{
// Set the LOCATION property of the target. Note that this cannot take
// into account the per-configuration name of the target because the
// configuration type may not be known at CMake time. We should
// deprecate this feature and instead support transforming an executable
// target name given as the command part of custom commands into the
// proper path at build time. Alternatively we could put environment
// variable settings in all custom commands that hold the name of the
// target for each configuration and then give a reference to the
// variable in the location.
this->SetProperty("TEST_LOCATION", this->GetTestLocation(0));
}
else
if(strcmp(prop, "OBJECT_FILES") == 0)
{
this->ComputeObjectFiles();
}
// Per-configuration location can be computed.
int len = static_cast<int>(strlen(prop));
if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0)
{
// Per-configuration location can be computed. // Per-configuration location can be computed.
int len = static_cast<int>(strlen(prop)); int len = static_cast<int>(strlen(prop));
if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0) if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0)
@ -1294,7 +1245,12 @@ const char *cmTarget::GetProperty(const char* prop,
std::string configName(prop, len-9); std::string configName(prop, len-9);
this->SetProperty(prop, this->GetLocation(configName.c_str())); this->SetProperty(prop, this->GetLocation(configName.c_str()));
} }
if(strcmp(prop, "OBJECT_FILES") == 0)
{
this->ComputeObjectFiles();
} }
// the type property returns what type the target is // the type property returns what type the target is
if (!strcmp(prop,"TYPE")) if (!strcmp(prop,"TYPE"))
{ {

4
Source/cmTarget.h
View File

@ -181,10 +181,6 @@ public:
target property. */ target property. */
const char* GetLocation(const char* config); const char* GetLocation(const char* config);
/** Get the location of the target in the build tree for use by ctest.
May make use of the CTEST_TEST_CONFIGURATION variable in ctest. */
const char* GetTestLocation(const char* config);
/** Get the target major and minor version numbers interpreted from /** Get the target major and minor version numbers interpreted from
the VERSION property. Version 0 is returned if the property is the VERSION property. Version 0 is returned if the property is
not set or cannot be parsed. */ not set or cannot be parsed. */