diff options
author | Brad King <brad.king@kitware.com> | 2001-07-31 15:29:21 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2001-07-31 15:29:21 (GMT) |
commit | cfa25e9e1a48938378c300dfbf5b33e62018f295 (patch) | |
tree | 146a67f93597b35e69c38255aaddbd0547b19f81 /Source/cmInstallFilesCommand.cxx | |
parent | 489e91a1f7b1d5d9542cb965b47a44f99878c7a5 (diff) | |
download | CMake-cfa25e9e1a48938378c300dfbf5b33e62018f295.zip CMake-cfa25e9e1a48938378c300dfbf5b33e62018f295.tar.gz CMake-cfa25e9e1a48938378c300dfbf5b33e62018f295.tar.bz2 |
ENH: Added INSTALL_PROGRAMS command and corresponding support. This involved splitting cmTarget::INSTALL into INSTALL_FILES and INSTALL_PROGRAMS enum values. INSTALL_FILES no longer adds execute permission. The INSTALL_PROGRAMS commnad takes either a list of explicit names, or a regex. It will not expand source lists like the INSTALL_FILES command will.
Diffstat (limited to 'Source/cmInstallFilesCommand.cxx')
-rw-r--r-- | Source/cmInstallFilesCommand.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmInstallFilesCommand.cxx b/Source/cmInstallFilesCommand.cxx index 4de3110..d7f68e5 100644 --- a/Source/cmInstallFilesCommand.cxx +++ b/Source/cmInstallFilesCommand.cxx @@ -52,9 +52,9 @@ bool cmInstallFilesCommand::InitialPass(std::vector<std::string>& args) cmTargets &tgts = m_Makefile->GetTargets(); std::vector<std::string>::iterator s = args.begin(); - if (tgts.find("INSTALL") != tgts.end()) + if (tgts.find("INSTALL_FILES") != tgts.end()) { - tgts["INSTALL"].SetInstallPath(args[0].c_str()); + tgts["INSTALL_FILES"].SetInstallPath(args[0].c_str()); } ++s; for (;s != args.end(); ++s) @@ -71,7 +71,7 @@ void cmInstallFilesCommand::FinalPass() std::string testf; std::string ext = m_FinalArgs[0]; - if (tgts.find("INSTALL") == tgts.end()) + if (tgts.find("INSTALL_FILES") == tgts.end()) { return; } @@ -98,7 +98,7 @@ void cmInstallFilesCommand::FinalPass() { testf = c->GetSourceName() + ext; // add to the result - tgts["INSTALL"].GetSourceLists().push_back(testf); + tgts["INSTALL_FILES"].GetSourceLists().push_back(testf); } } // if one wasn't found then assume it is a single class @@ -106,7 +106,7 @@ void cmInstallFilesCommand::FinalPass() { testf = temps + ext; // add to the result - tgts["INSTALL"].GetSourceLists().push_back(testf); + tgts["INSTALL_FILES"].GetSourceLists().push_back(testf); } } } @@ -120,7 +120,7 @@ void cmInstallFilesCommand::FinalPass() // for each argument, get the files for (;s != files.end(); ++s) { - tgts["INSTALL"].GetSourceLists().push_back(*s); + tgts["INSTALL_FILES"].GetSourceLists().push_back(*s); } } } |