BUG: change to new variables
This commit is contained in:
parent
5031b41ea5
commit
cb42655060
|
@ -1877,15 +1877,17 @@ void cmLocalUnixMakefileGenerator::OutputInstallRules(std::ostream& fout)
|
||||||
fout << " $(DESTDIR)" << prefix << l->second.GetInstallPath() << "\n";
|
fout << " $(DESTDIR)" << prefix << l->second.GetInstallPath() << "\n";
|
||||||
break;
|
break;
|
||||||
case cmTarget::SHARED_LIBRARY:
|
case cmTarget::SHARED_LIBRARY:
|
||||||
fout << "\t$(INSTALL_DATA) " << m_LibraryOutputPath << "lib"
|
fout << "\t$(INSTALL_DATA) " << m_LibraryOutputPath
|
||||||
|
<< this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_PREFIX")
|
||||||
<< l->first;
|
<< l->first;
|
||||||
fout << m_Makefile->GetDefinition("CMAKE_SHLIB_SUFFIX");
|
fout << this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_SUFFIX");
|
||||||
fout << " $(DESTDIR)" << prefix << l->second.GetInstallPath() << "\n";
|
fout << " $(DESTDIR)" << prefix << l->second.GetInstallPath() << "\n";
|
||||||
break;
|
break;
|
||||||
case cmTarget::MODULE_LIBRARY:
|
case cmTarget::MODULE_LIBRARY:
|
||||||
fout << "\t$(INSTALL_DATA) " << m_LibraryOutputPath << "lib"
|
fout << "\t$(INSTALL_DATA) " << m_LibraryOutputPath
|
||||||
|
<< this->GetSafeDefinition("CMAKE_SHARED_MODULE_PREFIX")
|
||||||
<< l->first;
|
<< l->first;
|
||||||
fout << m_Makefile->GetDefinition("CMAKE_MODULE_SUFFIX");
|
fout << this->GetSafeDefinition("CMAKE_SHARED_MODULE_SUFFIX");
|
||||||
fout << " $(DESTDIR)" << prefix << l->second.GetInstallPath() << "\n";
|
fout << " $(DESTDIR)" << prefix << l->second.GetInstallPath() << "\n";
|
||||||
break;
|
break;
|
||||||
case cmTarget::WIN32_EXECUTABLE:
|
case cmTarget::WIN32_EXECUTABLE:
|
||||||
|
|
Loading…
Reference in New Issue