Commit cca3bbde authored by Brad King's avatar Brad King 💬 Committed by Kitware Robot
Browse files

Merge topic 'ninja-gcc-windows'

cf8ce7a3 RC: Do not override MinGW Makefiles generator preference
ca658a45 Ninja: Use forward slashes for linking with any GCC on Windows (#15439)
parents 0f2658f6 cf8ce7a3
......@@ -138,7 +138,7 @@ macro(__windows_compiler_gnu lang)
endforeach()
endif()
if(NOT CMAKE_RC_COMPILER_INIT)
if(NOT CMAKE_RC_COMPILER_INIT AND NOT CMAKE_GENERATOR_RC)
set(CMAKE_RC_COMPILER_INIT windres)
endif()
......
......@@ -565,7 +565,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
vars["TARGET_PDB"] = base + suffix + dbg_suffix;
}
if (mf->IsOn("CMAKE_COMPILER_IS_MINGW"))
if (this->GetGlobalGenerator()->IsGCCOnWindows())
{
const std::string objPath = GetTarget()->GetSupportDirectory();
vars["OBJECT_DIR"] = ConvertToNinjaPath(objPath);
......
Supports Markdown
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