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

ENH: Only mangle object files if CMAKE_MANGLE_OBJECT_FILE_NAMES is set. Only on borland for now.

This commit is contained in:
Andy Cedilnik 2004-05-04 11:24:32 -04:00
parent 1f6e59a7fe
commit ea8dc0769d
2 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/Platform/Windows-bcc32.cmake
View File

@ -21,6 +21,8 @@ SET(BORLAND 1)
#SET(CMAKE_END_TEMP_FILE "") #SET(CMAKE_END_TEMP_FILE "")
#SET(CMAKE_VERBOSE_MAKEFILE 1) #SET(CMAKE_VERBOSE_MAKEFILE 1)
# Borland cannot handle + in the file name, so mangle object file name
SET (CMAKE_MANGLE_OBJECT_FILE_NAMES "ON")
# create a shared C++ library # create a shared C++ library
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY SET(CMAKE_CXX_CREATE_SHARED_LIBRARY

57
Source/cmLocalUnixMakefileGenerator.cxx
View File

@ -3077,38 +3077,45 @@ std::string cmLocalUnixMakefileGenerator::LowerCasePath(const char* path)
std::string& std::string&
cmLocalUnixMakefileGenerator::CreateSafeUniqueObjectFileName(const char* sin) cmLocalUnixMakefileGenerator::CreateSafeUniqueObjectFileName(const char* sin)
{ {
std::map<cmStdString,cmStdString>::iterator it = m_UniqueObjectNamesMap.find(sin); if ( m_Makefile->IsOn("CMAKE_MANGLE_OBJECT_FILE_NAMES") )
if ( it == m_UniqueObjectNamesMap.end() )
{ {
std::string ssin = sin; std::map<cmStdString,cmStdString>::iterator it = m_UniqueObjectNamesMap.find(sin);
bool done; if ( it == m_UniqueObjectNamesMap.end() )
int cc = 0;
char rpstr[100];
sprintf(rpstr, "_p_");
cmSystemTools::ReplaceString(ssin, "+", rpstr);
std::string sssin = sin;
do
{ {
done = true; std::string ssin = sin;
for ( it = m_UniqueObjectNamesMap.begin(); bool done;
it != m_UniqueObjectNamesMap.end(); int cc = 0;
++ it ) char rpstr[100];
sprintf(rpstr, "_p_");
cmSystemTools::ReplaceString(ssin, "+", rpstr);
std::string sssin = sin;
do
{ {
if ( it->second == ssin ) done = true;
for ( it = m_UniqueObjectNamesMap.begin();
it != m_UniqueObjectNamesMap.end();
++ it )
{ {
done = false; if ( it->second == ssin )
{
done = false;
}
} }
if ( done )
{
break;
}
sssin = ssin;
cmSystemTools::ReplaceString(ssin, "_p_", rpstr);
sprintf(rpstr, "_p%d_", cc++);
} }
if ( done ) while ( !done );
{ m_UniqueObjectNamesMap[sin] = ssin;
break;
}
sssin = ssin;
cmSystemTools::ReplaceString(ssin, "_p_", rpstr);
sprintf(rpstr, "_p%d_", cc++);
} }
while ( !done ); }
m_UniqueObjectNamesMap[sin] = ssin; else
{
m_UniqueObjectNamesMap[sin] = sin;
} }
return m_UniqueObjectNamesMap[sin]; return m_UniqueObjectNamesMap[sin];
} }