From ca5e6dadb58f72bf758971d7cab46b9a57cbe71b Mon Sep 17 00:00:00 2001 From: Martin Duffy Date: Mon, 13 Jan 2025 07:56:07 -0500 Subject: [PATCH] install: Generate InstallScripts.json in consistent location Since commit 159ba027b9 (Install: Add parallel installation option, 2024-06-19, v3.31.0-rc1~333^2) the file was generated relative to the current working directory. This is not always the top of the build tree, so specify the path explicitly. --- Source/cmGlobalGenerator.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index e3a38b0168..e361ad26a5 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1824,7 +1824,10 @@ void cmGlobalGenerator::WriteInstallJson() const for (const auto& file : this->InstallScripts) { index["InstallScripts"].append(file); } - this->WriteJsonContent("CMakeFiles/InstallScripts.json", index); + this->WriteJsonContent( + cmStrCat(this->CMakeInstance->GetHomeOutputDirectory(), + "/CMakeFiles/InstallScripts.json"), + index); } } #endif