summaryrefslogtreecommitdiffstats
path: root/Source/cmTarget.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2007-05-23 19:40:12 (GMT)
committerBrad King <brad.king@kitware.com>2007-05-23 19:40:12 (GMT)
commitba7780a3c494f2c2989e9528366c69dafbdccfec (patch)
tree38d791d439b11d6b02b9e3c4f20123b2b9734259 /Source/cmTarget.cxx
parent303b4312b2c28329a2aecde7d7ddd84137efa1ce (diff)
downloadCMake-ba7780a3c494f2c2989e9528366c69dafbdccfec.zip
CMake-ba7780a3c494f2c2989e9528366c69dafbdccfec.tar.gz
CMake-ba7780a3c494f2c2989e9528366c69dafbdccfec.tar.bz2
ENH: Fixed INSTALL_FILES and INSTALL_PROGRAMS commands to not create targets. No targets of type cmTarget::INSTALL_FILES or cmTarget::INSTALL_PROGRAMS are created, so we do not need to check for them everywhere anymore.
Diffstat (limited to 'Source/cmTarget.cxx')
-rw-r--r--Source/cmTarget.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index da33e07..6d9b419 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -337,6 +337,12 @@ void cmTarget::DefineProperties(cmake *cm)
void cmTarget::SetType(TargetType type, const char* name)
{
this->Name = name;
+ if(type == cmTarget::INSTALL_FILES ||
+ type == cmTarget::INSTALL_PROGRAMS ||
+ type == cmTarget::INSTALL_DIRECTORY)
+ {
+ abort();
+ }
// only add dependency information for library targets
this->TargetTypeValue = type;
if(this->TargetTypeValue >= STATIC_LIBRARY
@@ -664,12 +670,6 @@ void cmTarget::GenerateSourceFilesFromSourceLists( cmMakefile &mf)
{
return;
}
- // this is only done for non install targets
- if ((this->TargetTypeValue == cmTarget::INSTALL_FILES)
- || (this->TargetTypeValue == cmTarget::INSTALL_PROGRAMS))
- {
- return;
- }
// for each src lists add the classes
for (std::vector<std::string>::const_iterator s = this->SourceLists.begin();
s != this->SourceLists.end(); ++s)