From f1670ab18a21b635e58e1a53178c25c722911504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Wed, 26 Sep 2012 10:07:25 +0200 Subject: [PATCH 1/2] Ninja: don't confuse ninja's rsp files with nmake's Move response files into CMakeFiles/ which makes them different to nmake's. --- Source/cmGlobalNinjaGenerator.cxx | 12 +++++++++--- Source/cmGlobalNinjaGenerator.h | 1 + Source/cmNinjaNormalTargetGenerator.cxx | 9 +++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 3f3cfbbb1..05f5b4c86 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -106,6 +106,7 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os, const cmNinjaDeps& implicitDeps, const cmNinjaDeps& orderOnlyDeps, const cmNinjaVars& variables, + const std::string& rspfile, int cmdLineLimit) { // Make sure there is a rule. @@ -181,12 +182,17 @@ void cmGlobalNinjaGenerator::WriteBuild(std::ostream& os, // check if a response file rule should be used std::string buildstr = build.str(); - const std::string assignments = variable_assignments.str(); + std::string assignments = variable_assignments.str(); const std::string args = arguments.str(); if (cmdLineLimit > 0 && args.size() + buildstr.size() + assignments.size() - > (size_t) cmdLineLimit) - buildstr += "_RSPFILE"; + > (size_t) cmdLineLimit) { + buildstr += "_RSP_FILE"; + variable_assignments.clear(); + cmGlobalNinjaGenerator::WriteVariable(variable_assignments, + "RSP_FILE", rspfile, "", 1); + assignments += variable_assignments.str(); + } os << buildstr << args << assignments; } diff --git a/Source/cmGlobalNinjaGenerator.h b/Source/cmGlobalNinjaGenerator.h index b2fe24327..24c391610 100644 --- a/Source/cmGlobalNinjaGenerator.h +++ b/Source/cmGlobalNinjaGenerator.h @@ -84,6 +84,7 @@ public: const cmNinjaDeps& implicitDeps, const cmNinjaDeps& orderOnlyDeps, const cmNinjaVars& variables, + const std::string& rspfile = std::string(), int cmdLineLimit = -1); /** diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx index 6f991e29d..a13e1f0e8 100644 --- a/Source/cmNinjaNormalTargetGenerator.cxx +++ b/Source/cmNinjaNormalTargetGenerator.cxx @@ -153,7 +153,7 @@ cmNinjaNormalTargetGenerator cmTarget::TargetType targetType = this->GetTarget()->GetType(); std::string ruleName = this->LanguageLinkerRule(); if (useResponseFile) - ruleName += "_RSPFILE"; + ruleName += "_RSP_FILE"; // Select whether to use a response file for objects. std::string rspfile; @@ -179,7 +179,7 @@ cmNinjaNormalTargetGenerator } else { responseFlag = "@"; } - rspfile = "$out.rsp"; + rspfile = "$RSP_FILE"; responseFlag += rspfile; rspcontent = "$in $LINK_LIBRARIES"; vars.Objects = responseFlag.c_str(); @@ -549,6 +549,10 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() int commandLineLengthLimit = -1; #endif + const std::string rspfile = std::string + (cmake::GetCMakeFilesDirectoryPostSlash()) + + this->GetTarget()->GetName() + ".rsp"; + // Write the build statement for this target. cmGlobalNinjaGenerator::WriteBuild(this->GetBuildFileStream(), comment.str(), @@ -558,6 +562,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement() implicitDeps, emptyDeps, vars, + rspfile, commandLineLengthLimit); if (targetOutput != targetOutputReal) { From dbd99d6fbbdf76181ac01ec9cc32fd3b67a4ce7c Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 1 Oct 2012 16:20:42 -0400 Subject: [PATCH 2/2] Revert "Ninja: don't expand any rsp files" This reverts commit 5598d9b2a06d4ec788b5e058435bb3bba99fd517. Since commit f1670ab1 (Ninja: don't confuse ninja's rsp files with nmake's, 2012-09-26) Ninja generator response files are placed in CMakeFiles/ so the previously existing check already avoids expanding them. --- Modules/Platform/Windows-Intel.cmake | 9 +++------ Modules/Platform/Windows-MSVC.cmake | 7 ++----- Source/cmake.cxx | 22 +++++++--------------- Source/cmake.h | 3 +-- 4 files changed, 13 insertions(+), 28 deletions(-) diff --git a/Modules/Platform/Windows-Intel.cmake b/Modules/Platform/Windows-Intel.cmake index 41e150acb..3a30a2e0c 100644 --- a/Modules/Platform/Windows-Intel.cmake +++ b/Modules/Platform/Windows-Intel.cmake @@ -98,14 +98,11 @@ macro(__windows_compiler_intel lang) set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/DNDEBUG /MD /Zi /O2") if(_INTEL_COMPILER_SUPPORTS_MANIFEST) - if(CMAKE_GENERATOR MATCHES "Ninja") - set(NO_RSP_EXPAND _no_rsp_expand) - endif() set(CMAKE_${lang}_LINK_EXECUTABLE - " -E vs_link_exe${NO_RSP_EXPAND} ${CMAKE_${lang}_LINK_EXECUTABLE}") + " -E vs_link_exe ${CMAKE_${lang}_LINK_EXECUTABLE}") set(CMAKE_${lang}_CREATE_SHARED_LIBRARY - " -E vs_link_dll${NO_RSP_EXPAND} ${CMAKE_${lang}_CREATE_SHARED_LIBRARY}") + " -E vs_link_dll ${CMAKE_${lang}_CREATE_SHARED_LIBRARY}") set(CMAKE_${lang}_CREATE_SHARED_MODULE - " -E vs_link_dll${NO_RSP_EXPAND} ${CMAKE_${lang}_CREATE_SHARED_MODULE}") + " -E vs_link_dll ${CMAKE_${lang}_CREATE_SHARED_MODULE}") endif() endmacro() diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index da0dba99c..cc48cfe29 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -212,11 +212,8 @@ set (CMAKE_MODULE_LINKER_FLAGS_MINSIZEREL_INIT ${CMAKE_EXE_LINKER_FLAGS_MINSIZER macro(__windows_compiler_msvc lang) if(NOT "${CMAKE_${lang}_COMPILER_VERSION}" VERSION_LESS 14) # for 2005 make sure the manifest is put in the dll with mt - if(CMAKE_GENERATOR MATCHES "Ninja") - set(NO_RSP_EXPAND _no_rsp_expand) - endif() - set(_CMAKE_VS_LINK_DLL " -E vs_link_dll${NO_RSP_EXPAND} ") - set(_CMAKE_VS_LINK_EXE " -E vs_link_exe${NO_RSP_EXPAND} ") + set(_CMAKE_VS_LINK_DLL " -E vs_link_dll ") + set(_CMAKE_VS_LINK_EXE " -E vs_link_exe ") endif() set(CMAKE_${lang}_CREATE_SHARED_LIBRARY "${_CMAKE_VS_LINK_DLL} ${CMAKE_CL_NOLOGO} ${CMAKE_START_TEMP_FILE} /out: /implib: /pdb: /dll /version:. ${CMAKE_END_TEMP_FILE}") diff --git a/Source/cmake.cxx b/Source/cmake.cxx index 6cb7aa447..745d51359 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1683,19 +1683,11 @@ int cmake::ExecuteCMakeCommand(std::vector& args) } else if (args[1] == "vs_link_exe") { - return cmake::VisualStudioLink(args, 1, false); + return cmake::VisualStudioLink(args, 1); } else if (args[1] == "vs_link_dll") { - return cmake::VisualStudioLink(args, 2, false); - } - else if (args[1] == "vs_link_exe_no_rsp_expand") - { - return cmake::VisualStudioLink(args, 1, true); - } - else if (args[1] == "vs_link_dll_no_rsp_expand") - { - return cmake::VisualStudioLink(args, 2, true); + return cmake::VisualStudioLink(args, 2); } #ifdef CMAKE_BUILD_WITH_CMAKE // Internal CMake color makefile support. @@ -4021,8 +4013,7 @@ static bool cmakeCheckStampList(const char* stampList) // For visual studio 2005 and newer manifest files need to be embeded into // exe and dll's. This code does that in such a way that incremental linking // still works. -int cmake::VisualStudioLink(std::vector& args, int type, - bool no_rsp_expand) +int cmake::VisualStudioLink(std::vector& args, int type) { if(args.size() < 2) { @@ -4037,12 +4028,13 @@ int cmake::VisualStudioLink(std::vector& args, int type, for(std::vector::iterator i = args.begin(); i != args.end(); ++i) { - // check for nmake temporary files (there are two rsp files) - if(!no_rsp_expand && (*i)[0] == '@' && i->find("@CMakeFiles") != 0 ) + // check for nmake temporary files + if((*i)[0] == '@' && i->find("@CMakeFiles") != 0 ) { std::ifstream fin(i->substr(1).c_str()); std::string line; - while(cmSystemTools::GetLineFromStream(fin, line)) + while(cmSystemTools::GetLineFromStream(fin, + line)) { cmSystemTools::ParseWindowsCommandLine(line.c_str(), expandedArgs); } diff --git a/Source/cmake.h b/Source/cmake.h index 12e5edffc..94c6f128f 100644 --- a/Source/cmake.h +++ b/Source/cmake.h @@ -447,8 +447,7 @@ protected: std::string const& link); static int ExecuteEchoColor(std::vector& args); static int ExecuteLinkScript(std::vector& args); - static int VisualStudioLink(std::vector& args, int type, - bool no_rsp_expand); + static int VisualStudioLink(std::vector& args, int type); static int VisualStudioLinkIncremental(std::vector& args, int type, bool verbose);