kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix install when executable and lib path set

This commit is contained in:
Ken Martin 2001-06-27 16:14:14 -04:00
parent a5cda2217d
commit ae243b21bb
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmUnixMakefileGenerator.cxx
View File

@ -563,7 +563,7 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
{ {
// if the library is not in the current directory, then get the full // if the library is not in the current directory, then get the full
// path to it // path to it
std::string libpath = cacheValue; libpath = cacheValue;
if(m_LibraryOutputPath.size()) if(m_LibraryOutputPath.size())
{ {
libpath = m_LibraryOutputPath; libpath = m_LibraryOutputPath;
@ -577,7 +577,8 @@ void cmUnixMakefileGenerator::OutputDependencies(std::ostream& fout)
else else
{ {
// library is in current Makefile so use lib as a prefix // library is in current Makefile so use lib as a prefix
libpath = "lib"; libpath = m_LibraryOutputPath;
libpath += "lib";
} }
// add the library name // add the library name
libpath += lib2->first; libpath += lib2->first;
@ -1019,7 +1020,8 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
switch (l->second.GetType()) switch (l->second.GetType())
{ {
case cmTarget::LIBRARY: case cmTarget::LIBRARY:
fout << "\t$(INSTALL_DATA) lib" << l->first; fout << "\t$(INSTALL_DATA) " << m_LibraryOutputPath << "lib"
<< l->first;
if(dll) if(dll)
{ {
fout << m_Makefile->GetDefinition("CMAKE_SHLIB_SUFFIX"); fout << m_Makefile->GetDefinition("CMAKE_SHLIB_SUFFIX");
@ -1032,7 +1034,8 @@ void cmUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
break; break;
case cmTarget::WIN32_EXECUTABLE: case cmTarget::WIN32_EXECUTABLE:
case cmTarget::EXECUTABLE: case cmTarget::EXECUTABLE:
fout << "\t$(INSTALL_PROGRAM) " << l->first fout << "\t$(INSTALL_PROGRAM) " << m_ExecutableOutputPath
<< l->first
<< cmSystemTools::GetExecutableExtension() << cmSystemTools::GetExecutableExtension()
<< " " << prefix << l->second.GetInstallPath() << "\n"; << " " << prefix << l->second.GetInstallPath() << "\n";
break; break;