1 files changed, 31 insertions, 25 deletions
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
index a5ff61f153..c6bfa4d59a 100644
--- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@@ -7,32 +7,38 @@ instructions:
   - type: ChangeDirectory
     directory: "{{.BuildDir}}/build"
   - type: MakeDirectory
-    directory: host
-  - type: MakeDirectory
     directory: target
-  - type: SetBuildDirectory
-    directory: "{{.SourceDir}}/build/host"
-  - type: ChangeDirectory
-    directory: "{{.BuildDir}}"
-  - type: EnvironmentVariable
-    variableName: COIN_CMAKE_ARGS
-    # The lack of space between the non qtbase configure args and the rest of the args is important!
-    variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}"
-  - !include "{{qt/qtbase}}/call_host_cmake.yaml"
-  - type: ExecuteCommand
-    command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v"
-    maxTimeInSeconds: 6000
-    maxTimeBetweenOutput: 1200
-    userMessageOnFailure: >
-      Failed to build sources. In the current state bug can be everywhere.
-  - type: EnvironmentVariable
-    variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
-    variableValue: "{{.InstallDir}}/host"
-  - !include "{{qt/qtbase}}/call_host_install.yaml"
-  - type: EnvironmentVariable
-    variableName: DESTDIR
-    variableValue: "{{.InstallRoot}}"
-  - !include "{{qt/qtbase}}/call_host_install.yaml"
+  - type: Group
+    instructions:
+      - type: MakeDirectory
+        directory: host
+      - type: SetBuildDirectory
+        directory: "{{.SourceDir}}/build/host"
+      - type: ChangeDirectory
+        directory: "{{.BuildDir}}"
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_ARGS
+        # The lack of space between the non qtbase configure args and the rest of the args is important!
+        variableValue: "{{.Env.NON_QTBASE_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}"
+      - !include "{{qt/qtbase}}/call_host_cmake.yaml"
+      - type: ExecuteCommand
+        command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v"
+        maxTimeInSeconds: 6000
+        maxTimeBetweenOutput: 1200
+        userMessageOnFailure: >
+          Failed to build sources. In the current state bug can be everywhere.
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
+        variableValue: "{{.InstallDir}}/host"
+      - !include "{{qt/qtbase}}/call_host_install.yaml"
+      - type: EnvironmentVariable
+        variableName: DESTDIR
+        variableValue: "{{.InstallRoot}}"
+      - !include "{{qt/qtbase}}/call_host_install.yaml"
+    enable_if:
+      condition: property
+      property: platformDependency
+      equals_value: null
   - type: EnvironmentVariable
     variableName: DESTDIR
     variableValue: ""