From ea8182016b3b0193107966a3fa6d0bcbee0bfd52 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 14 Jun 2023 15:41:20 +0200
Subject: [PATCH] CMake: Fix command line for "staging" an installation

Fix that the "install" target was added too late in the command line
arguments, leading a cmake error for multi-config setups like for iOS.

Change-Id: If35a96725f55b5d250ccdd7386ba02d7a21ede85
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/plugins/cmakeprojectmanager/cmakebuildstep.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
index 2d2501ab03b..68f42127a21 100644
--- a/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakebuildstep.cpp
@@ -426,8 +426,10 @@ CommandLine CMakeBuildStep::cmakeCommand() const
         }
         return s;
     }));
+    if (m_useStaging->value())
+        cmd.addArg("install");
 
-    auto bs = qobject_cast<CMakeBuildSystem*>(buildSystem());
+    auto bs = qobject_cast<CMakeBuildSystem *>(buildSystem());
     if (bs && bs->isMultiConfigReader()) {
         cmd.addArg("--config");
         if (m_configuration)
@@ -439,9 +441,6 @@ CommandLine CMakeBuildStep::cmakeCommand() const
     if (!m_cmakeArguments->value().isEmpty())
         cmd.addArgs(m_cmakeArguments->value(), CommandLine::Raw);
 
-    if (m_useStaging->value())
-        cmd.addArg("install");
-
     bool toolArgumentsSpecified = false;
     if (!m_toolArguments->value().isEmpty()) {
         cmd.addArg("--");