Commit d4498a9e authored by Bill Hoffman's avatar Bill Hoffman

BUG: fix for sun compiler

parent 9f8d296f
......@@ -111,7 +111,7 @@ bool cmCacheManager::LoadCache(const char* path,
const int bsize = 4096;
char buffer[bsize];
// input line is: key:type=value
cmRegularExpression reg("(.*):(.*)=(.*)");
cmRegularExpression reg("^([^:]*):([^=]*)=(.*)$");
while(fin)
{
// Format is key:type=value
......
......@@ -760,6 +760,13 @@ void cmUnixMakefileGenerator::OutputMakeVariables(std::ostream& fout)
"\n"
"\n";
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);
fout << replaceVars.c_str();
fout << "CMAKE_CURRENT_SOURCE = " << m_Makefile->GetStartDirectory() << "\n";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment