diff options
| author | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-01-27 17:37:30 (GMT) |
|---|---|---|
| committer | Andy Cedilnik <andy.cedilnik@kitware.com> | 2004-01-27 17:37:30 (GMT) |
| commit | d13e30f3ae02444682a2e593768020b9d11b6b54 (patch) | |
| tree | 1bda720a9a8f0c993a5f6c848c9328c0e455d6ef /Source/cmInstallTargetsCommand.cxx | |
| parent | 127872e820ea7aed784c780d29f824817193c14e (diff) | |
| download | CMake-d13e30f3ae02444682a2e593768020b9d11b6b54.zip CMake-d13e30f3ae02444682a2e593768020b9d11b6b54.tar.gz CMake-d13e30f3ae02444682a2e593768020b9d11b6b54.tar.bz2 | |
ENH: Make install on windows seems to work now
Diffstat (limited to 'Source/cmInstallTargetsCommand.cxx')
| -rw-r--r-- | Source/cmInstallTargetsCommand.cxx | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/Source/cmInstallTargetsCommand.cxx b/Source/cmInstallTargetsCommand.cxx index 1553754..421fcea 100644 --- a/Source/cmInstallTargetsCommand.cxx +++ b/Source/cmInstallTargetsCommand.cxx @@ -28,11 +28,24 @@ bool cmInstallTargetsCommand::InitialPass(std::vector<std::string> const& args) cmTargets &tgts = m_Makefile->GetTargets(); std::vector<std::string>::const_iterator s = args.begin(); ++s; + std::string runtime_dir = "/bin"; for (;s != args.end(); ++s) { - if (tgts.find(*s) != tgts.end()) + if (*s == "RUNTIME_DIRECTORY") + { + ++s; + if ( s == args.end() ) + { + this->SetError("called with RUNTIME_DIRECTORY but no actual directory"); + return false; + } + + runtime_dir = *s; + } + else if (tgts.find(*s) != tgts.end()) { tgts[*s].SetInstallPath(args[0].c_str()); + tgts[*s].SetRuntimeInstallPath(runtime_dir.c_str()); } } |