From b53d3c7cc198afb000bcac0c0a9c2c812a864a8c Mon Sep 17 00:00:00 2001 From: Simon Maertens Date: Tue, 5 May 2026 19:18:02 +0100 Subject: [PATCH] Makefiles: Make logic enabling CUDA device link response files more specific Prepare to add more non-Link types of response files. --- Source/cmMakefileTargetGenerator.cxx | 9 +++++---- Source/cmMakefileTargetGenerator.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 77b1550b72..a8e19f2f87 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -2256,9 +2256,9 @@ void cmMakefileTargetGenerator::CreateLinkLibs( // Create this response file. std::string const responseFileName = - (responseMode == Link) ? "linkLibs.rsp" : "deviceLinkLibs.rsp"; + (responseMode == DeviceLink) ? "deviceLinkLibs.rsp" : "linkLibs.rsp"; std::string const responseLang = - (responseMode == Link) ? linkLanguage : "CUDA"; + (responseMode == DeviceLink) ? "CUDA" : linkLanguage; std::string link_rsp = this->CreateResponseFile( responseFileName, linkLibs, makefile_depends, responseLang); @@ -2295,8 +2295,9 @@ void cmMakefileTargetGenerator::CreateObjectLists( char const* sep = ""; for (unsigned int i = 0; i < object_strings.size(); ++i) { // Number the response files. - std::string responseFileName = cmStrCat( - (responseMode == Link) ? "objects" : "deviceObjects", i + 1, ".rsp"); + std::string responseFileName = + cmStrCat((responseMode == DeviceLink) ? "deviceObjects" : "objects", + i + 1, ".rsp"); // Create this response file. std::string objects_rsp = this->CreateResponseFile( diff --git a/Source/cmMakefileTargetGenerator.h b/Source/cmMakefileTargetGenerator.h index fe255f4316..7e551a8e9a 100644 --- a/Source/cmMakefileTargetGenerator.h +++ b/Source/cmMakefileTargetGenerator.h @@ -175,7 +175,7 @@ protected: enum ResponseFlagFor { Link, - DeviceLink + DeviceLink, }; /** Create list of flags for link libraries. */