summaryrefslogtreecommitdiffstats
path: root/Source/cmExportLibraryDependencies.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/cmExportLibraryDependencies.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/cmExportLibraryDependencies.cxx')
-rw-r--r--Source/cmExportLibraryDependencies.cxx34
1 files changed, 15 insertions, 19 deletions
diff --git a/Source/cmExportLibraryDependencies.cxx b/Source/cmExportLibraryDependencies.cxx
index a5d66e7..bf9d533 100644
--- a/Source/cmExportLibraryDependencies.cxx
+++ b/Source/cmExportLibraryDependencies.cxx
@@ -94,28 +94,24 @@ void cmExportLibraryDependenciesCommand::FinalPass()
for(cmTargets::iterator l = tgts.begin();
l != tgts.end(); ++l)
{
- if ((l->second.GetType() != cmTarget::INSTALL_FILES)
- && (l->second.GetType() != cmTarget::INSTALL_PROGRAMS))
+ libDepName = l->first;
+ libDepName += "_LIB_DEPENDS";
+ const char* def = this->Makefile->GetDefinition(libDepName.c_str());
+ if(def)
{
- libDepName = l->first;
- libDepName += "_LIB_DEPENDS";
- const char* def = this->Makefile->GetDefinition(libDepName.c_str());
- if(def)
+ fout << "SET(" << libDepName << " \"" << def << "\")\n";
+ // now for each dependency, check for link type
+ cmSystemTools::ExpandListArgument(def, depends);
+ for(std::vector<std::string>::const_iterator d = depends.begin();
+ d != depends.end(); ++d)
{
- fout << "SET(" << libDepName << " \"" << def << "\")\n";
- // now for each dependency, check for link type
- cmSystemTools::ExpandListArgument(def, depends);
- for(std::vector<std::string>::const_iterator d = depends.begin();
- d != depends.end(); ++d)
+ libDepName = *d;
+ libDepName += "_LINK_TYPE";
+ defType = this->Makefile->GetDefinition(libDepName.c_str());
+ libDepName = cmSystemTools::EscapeSpaces(libDepName.c_str());
+ if(defType)
{
- libDepName = *d;
- libDepName += "_LINK_TYPE";
- defType = this->Makefile->GetDefinition(libDepName.c_str());
- libDepName = cmSystemTools::EscapeSpaces(libDepName.c_str());
- if(defType)
- {
- fout << "SET(" << libDepName << " \"" << defType << "\")\n";
- }
+ fout << "SET(" << libDepName << " \"" << defType << "\")\n";
}
}
}