diff options
author | Ken Martin <ken.martin@kitware.com> | 2002-06-27 19:57:09 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2002-06-27 19:57:09 (GMT) |
commit | 44a7cd55ff126412d8ba8b82739a1bee132c62a1 (patch) | |
tree | 533de5563331136062407c254c05024bb5b91632 /Source/cmInstallFilesCommand.cxx | |
parent | a1a05a5fbcd0d34aa5ab0dde7da2ba4c5082916a (diff) | |
download | CMake-44a7cd55ff126412d8ba8b82739a1bee132c62a1.zip CMake-44a7cd55ff126412d8ba8b82739a1bee132c62a1.tar.gz CMake-44a7cd55ff126412d8ba8b82739a1bee132c62a1.tar.bz2 |
removed all source lists from the system and made them vectors. Also appended _CMAKE_PATH to the end of the automatic cache entries for executables and libraries. Odds of all these changes working are slim but cmake builds and passes all its tests. VTK40 starts building
Diffstat (limited to 'Source/cmInstallFilesCommand.cxx')
-rw-r--r-- | Source/cmInstallFilesCommand.cxx | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx index 31aa5fa..6095dcc 100644 --- a/Source/cmInstallFilesCommand.cxx +++ b/Source/cmInstallFilesCommand.cxx @@ -26,7 +26,7 @@ bool cmInstallFilesCommand::InitialPass(std::vector<std::string> const& argsIn) return false; } std::vector<std::string> args; - cmSystemTools::ExpandListArguments(argsIn, args); + m_Makefile->ExpandSourceListArguments(argsIn, args, 2); // Create an INSTALL_FILES target specifically for this path. m_TargetName = "INSTALL_FILES_"+args[0]; @@ -63,26 +63,9 @@ void cmInstallFilesCommand::FinalPass() { // replace any variables std::string temps = *s; - // look for a srclist - if (m_Makefile->GetSources().find(temps) != m_Makefile->GetSources().end()) - { - const std::vector<cmSourceFile*> &clsList = - m_Makefile->GetSources().find(temps)->second; - std::vector<cmSourceFile*>::const_iterator c = clsList.begin(); - for (; c != clsList.end(); ++c) - { - testf = (*c)->GetSourceName() + ext; - // add to the result - targetSourceLists.push_back(testf); - } - } - // if one wasn't found then assume it is a single class - else - { - testf = temps + ext; - // add to the result - targetSourceLists.push_back(testf); - } + testf = temps + ext; + // add to the result + targetSourceLists.push_back(testf); } } else // reg exp list |