Fix compile flags on c files in static liobraries on windows
This commit is contained in:
parent
115ea25dab
commit
4b0c9ee2be
|
@ -2206,12 +2206,6 @@ OutputBuildObjectFromSource(std::ostream& fout,
|
||||||
rules.push_back(m_Makefile->GetDefinition("CMAKE_C_COMPILE_OBJECT"));
|
rules.push_back(m_Makefile->GetDefinition("CMAKE_C_COMPILE_OBJECT"));
|
||||||
flags += this->GetSafeDefinition("CMAKE_C_FLAGS");
|
flags += this->GetSafeDefinition("CMAKE_C_FLAGS");
|
||||||
flags += " ";
|
flags += " ";
|
||||||
if(shared)
|
|
||||||
{
|
|
||||||
flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_C_FLAGS");
|
|
||||||
flags += " ";
|
|
||||||
flags += this->GetSafeDefinition("CMAKE_C_FLAGS");
|
|
||||||
flags += " ";
|
|
||||||
if(buildType.size())
|
if(buildType.size())
|
||||||
{
|
{
|
||||||
std::string build = "CMAKE_C_FLAGS_";
|
std::string build = "CMAKE_C_FLAGS_";
|
||||||
|
@ -2219,6 +2213,10 @@ OutputBuildObjectFromSource(std::ostream& fout,
|
||||||
flags += this->GetSafeDefinition(build.c_str());
|
flags += this->GetSafeDefinition(build.c_str());
|
||||||
flags += " ";
|
flags += " ";
|
||||||
}
|
}
|
||||||
|
if(shared)
|
||||||
|
{
|
||||||
|
flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_C_FLAGS");
|
||||||
|
flags += " ";
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue