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

BUG: fix for sun compiler

This commit is contained in:
Bill Hoffman 2001-05-16 18:08:14 -04:00
parent 9f8d296f15
commit d4498a9e52
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmCacheManager.cxx
View File

@ -111,7 +111,7 @@ bool cmCacheManager::LoadCache(const char* path,
const int bsize = 4096; const int bsize = 4096;
char buffer[bsize]; char buffer[bsize];
// input line is: key:type=value // input line is: key:type=value
cmRegularExpression reg("(.*):(.*)=(.*)"); cmRegularExpression reg("^([^:]*):([^=]*)=(.*)$");
while(fin) while(fin)
{ {
// Format is key:type=value // Format is key:type=value

7
Source/cmUnixMakefileGenerator.cxx
View File

@ -760,6 +760,13 @@ void cmUnixMakefileGenerator::OutputMakeVariables(std::ostream& fout)
"\n" "\n"
"\n"; "\n";
std::string replaceVars = variables; std::string replaceVars = variables;
bool dll = cmCacheManager::GetInstance()->IsOn("BUILD_SHARED_LIBS");
if(!dll)
{
// if not a dll then remove the shlib -fpic flag
m_Makefile->AddDefinition("CMAKE_SHLIB_CFLAGS", "");
}
m_Makefile->ExpandVariablesInString(replaceVars); m_Makefile->ExpandVariablesInString(replaceVars);
fout << replaceVars.c_str(); fout << replaceVars.c_str();
fout << "CMAKE_CURRENT_SOURCE = " << m_Makefile->GetStartDirectory() << "\n"; fout << "CMAKE_CURRENT_SOURCE = " << m_Makefile->GetStartDirectory() << "\n";