diff options
| author | Ken Martin <ken.martin@kitware.com> | 2001-06-27 20:14:14 (GMT) |
|---|---|---|
| committer | Ken Martin <ken.martin@kitware.com> | 2001-06-27 20:14:14 (GMT) |
| commit | ae243b21bbeef820bb12eb1fb154600aebffb531 (patch) | |
| tree | 8b91de8e3f1ca276ae5f8281313cff3a3ade2522 /Source | |
| parent | a5cda2217d4e88b298be544e553725c5a3c80b56 (diff) | |
| download | CMake-ae243b21bbeef820bb12eb1fb154600aebffb531.zip CMake-ae243b21bbeef820bb12eb1fb154600aebffb531.tar.gz CMake-ae243b21bbeef820bb12eb1fb154600aebffb531.tar.bz2 | |
ENH: fix install when executable and lib path set
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmUnixMakefileGenerator.cxx | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx index 7ad6d22..bd75c6f 100644 --- a/Source/cmUnixMakefileGenerator.cxx +++ b/Source/cmUnixMakefileGenerator.cxx @@ -563,7 +563,7 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout) { // if the library is not in the current directory, then get the full // path to it - std::string libpath = cacheValue; + libpath = cacheValue; if(m_LibraryOutputPath.size()) { libpath = m_LibraryOutputPath; @@ -577,7 +577,8 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout) else { // library is in current Makefile so use lib as a prefix - libpath = "lib"; + libpath = m_LibraryOutputPath; + libpath += "lib"; } // add the library name libpath += lib2->first; @@ -1019,7 +1020,8 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout) switch (l->second.GetType()) { case cmTarget::LIBRARY: - fout << "\t$(INSTALL_DATA) lib" << l->first; + fout << "\t$(INSTALL_DATA) " << m_LibraryOutputPath << "lib" + << l->first; if(dll) { fout << m_Makefile->GetDefinition("CMAKE_SHLIB_SUFFIX"); @@ -1032,7 +1034,8 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout) break; case cmTarget::WIN32_EXECUTABLE: case cmTarget::EXECUTABLE: - fout << "\t$(INSTALL_PROGRAM) " << l->first + fout << "\t$(INSTALL_PROGRAM) " << m_ExecutableOutputPath + << l->first << cmSystemTools::GetExecutableExtension() << " " << prefix << l->second.GetInstallPath() << "\n"; break; |