[cmake-commits] martink committed cmTarget.h 1.71 1.72 cmTarget.cxx
1.122 1.123
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Feb 19 14:32:38 EST 2007
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv10047
Modified Files:
cmTarget.h cmTarget.cxx
Log Message:
BUG: fix accidental checkin
Index: cmTarget.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- cmTarget.h 19 Feb 2007 18:20:27 -0000 1.71
+++ cmTarget.h 19 Feb 2007 19:32:36 -0000 1.72
@@ -181,10 +181,6 @@
target property. */
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
the VERSION property. Version 0 is returned if the property is
not set or cannot be parsed. */
Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- cmTarget.cxx 19 Feb 2007 18:20:27 -0000 1.122
+++ cmTarget.cxx 19 Feb 2007 19:32:36 -0000 1.123
@@ -233,12 +233,6 @@
"(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
("VERSION", cmProperty::TARGET,
"What version number is this target.",
"For shared libraries VERSION and SOVERSION can be used to specify "
@@ -1153,25 +1147,6 @@
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)
{
@@ -1263,38 +1238,19 @@
this->SetProperty("LOCATION", this->GetLocation(0));
}
- if (!strcmp(prop,"TEST_LOCATION"))
+ // Per-configuration location can be computed.
+ int len = static_cast<int>(strlen(prop));
+ if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0)
{
- // 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));
+ std::string configName(prop, len-9);
+ this->SetProperty(prop, this->GetLocation(configName.c_str()));
}
- 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.
- int len = static_cast<int>(strlen(prop));
- if(len > 9 && strcmp(prop+len-9, "_LOCATION") == 0)
- {
- std::string configName(prop, len-9);
- this->SetProperty(prop, this->GetLocation(configName.c_str()));
- }
- }
// the type property returns what type the target is
if (!strcmp(prop,"TYPE"))
{
More information about the Cmake-commits
mailing list