reorder tWR so that it does not crash with shared
This commit is contained in:
parent
b7b32566d2
commit
a79b16a67f
|
@ -8,9 +8,11 @@ SET(CMAKE_END_TEMP_FILE "\n|")
|
||||||
#SET(CMAKE_START_TEMP_FILE "")
|
#SET(CMAKE_START_TEMP_FILE "")
|
||||||
#SET(CMAKE_END_TEMP_FILE "")
|
#SET(CMAKE_END_TEMP_FILE "")
|
||||||
#SET(CMAKE_VERBOSE_MAKEFILE 1)
|
#SET(CMAKE_VERBOSE_MAKEFILE 1)
|
||||||
|
|
||||||
|
|
||||||
# create a shared C++ library
|
# create a shared C++ library
|
||||||
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
|
SET(CMAKE_CXX_CREATE_SHARED_LIBRARY
|
||||||
"<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE}-e<TARGET> -tWD -tWR <LINK_LIBRARIES> <LINK_FLAGS> <OBJECTS>${CMAKE_END_TEMP_FILE}"
|
"<CMAKE_CXX_COMPILER> ${CMAKE_START_TEMP_FILE}-e<TARGET> -tWD <LINK_FLAGS> -tWR <LINK_LIBRARIES> <OBJECTS>${CMAKE_END_TEMP_FILE}"
|
||||||
"implib ${CMAKE_START_TEMP_FILE}-w <TARGET_BASE>.lib <TARGET_BASE>.dll${CMAKE_END_TEMP_FILE}"
|
"implib ${CMAKE_START_TEMP_FILE}-w <TARGET_BASE>.lib <TARGET_BASE>.dll${CMAKE_END_TEMP_FILE}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -2223,11 +2223,6 @@ OutputBuildObjectFromSource(std::ostream& fout,
|
||||||
}
|
}
|
||||||
case cmSystemTools::CXX_FILE_FORMAT:
|
case cmSystemTools::CXX_FILE_FORMAT:
|
||||||
{
|
{
|
||||||
if(cmSystemTools::IsOn(m_Makefile->GetDefinition("BUILD_SHARED_LIBS")))
|
|
||||||
{
|
|
||||||
flags += this->GetSafeDefinition("CMAKE_SHARED_BUILD_CXX_FLAGS");
|
|
||||||
flags += " ";
|
|
||||||
}
|
|
||||||
rules.push_back(m_Makefile->GetDefinition("CMAKE_CXX_COMPILE_OBJECT"));
|
rules.push_back(m_Makefile->GetDefinition("CMAKE_CXX_COMPILE_OBJECT"));
|
||||||
flags += this->GetSafeDefinition("CMAKE_CXX_FLAGS");
|
flags += this->GetSafeDefinition("CMAKE_CXX_FLAGS");
|
||||||
flags += " ";
|
flags += " ";
|
||||||
|
@ -2243,6 +2238,11 @@ OutputBuildObjectFromSource(std::ostream& fout,
|
||||||
flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_CXX_FLAGS");
|
flags += this->GetSafeDefinition("CMAKE_SHARED_LIBRARY_CXX_FLAGS");
|
||||||
flags += " ";
|
flags += " ";
|
||||||
}
|
}
|
||||||
|
if(cmSystemTools::IsOn(m_Makefile->GetDefinition("BUILD_SHARED_LIBS")))
|
||||||
|
{
|
||||||
|
flags += this->GetSafeDefinition("CMAKE_SHARED_BUILD_CXX_FLAGS");
|
||||||
|
flags += " ";
|
||||||
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case cmSystemTools::HEADER_FILE_FORMAT:
|
case cmSystemTools::HEADER_FILE_FORMAT:
|
||||||
|
|
Loading…
Reference in New Issue