1 files changed, 73 insertions, 4 deletions
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
index 2cf98b5ea2..a62ab0f48e 100644
--- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
+++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml
@@ -50,8 +50,42 @@ instructions:
         userMessageOnFailure: >
           Failed to build sources.
       - type: EnvironmentVariable
-        variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
-        variableValue: "{{.InstallDir}}/host"
+        variableName: COIN_CMAKE_INSTALL_DIR
+        variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}host"
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+        variableValue: "{{.Env.COIN_CMAKE_INSTALL_DIR}}{{.Env.CI_PATH_SEP}}libexec"
+        disable_if:
+          condition: and
+          conditions:
+            - condition: property
+              property: host.os
+              equals_value: Windows
+            - condition: and
+              conditions:
+                - condition: property
+                  property: target.os
+                  not_equals_value: QNX
+                - condition: property
+                  property: target.osVersion
+                  not_in_values: [WebAssembly, Android_ANY]
+      - type: EnvironmentVariable
+        variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+        variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}host{{.Env.CI_PATH_SEP}}bin"
+        enable_if:
+          condition: and
+          conditions:
+            - condition: property
+              property: host.os
+              equals_value: Windows
+            - condition: and
+              conditions:
+                - condition: property
+                  property: target.os
+                  not_equals_value: QNX
+                - condition: property
+                  property: target.osVersion
+                  not_in_values: [WebAssembly, Android_ANY]
       - !include "{{qt/qtbase}}/call_host_install.yaml"
       - type: EnvironmentVariable
         variableName: DESTDIR
@@ -88,8 +122,42 @@ instructions:
     userMessageOnFailure: >
       Failed to build sources.
   - type: EnvironmentVariable
-    variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH
-    variableValue: "{{.InstallDir}}/target"
+    variableName: COIN_CMAKE_INSTALL_DIR
+    variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}target"
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+    variableValue: "{{.Env.COIN_CMAKE_INSTALL_DIR}}{{.Env.CI_PATH_SEP}}libexec"
+    disable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
+  - type: EnvironmentVariable
+    variableName: COIN_CMAKE_INSTALL_LIBEXEC_DIR
+    variableValue: "{{.InstallDir}}{{.Env.CI_PATH_SEP}}target{{.Env.CI_PATH_SEP}}bin"
+    enable_if:
+      condition: and
+      conditions:
+        - condition: property
+          property: host.os
+          equals_value: Windows
+        - condition: and
+          conditions:
+            - condition: property
+              property: target.os
+              not_equals_value: QNX
+            - condition: property
+              property: target.osVersion
+              not_in_values: [WebAssembly, Android_ANY]
   - !include "{{qt/qtbase}}/call_target_install.yaml"
   - type: EnvironmentVariable
     variableName: DESTDIR
@@ -106,5 +174,6 @@ instructions:
   - type: EnvironmentVariable
     variableName: COIN_CONFIG_TYPE
     variableValue: "Target"
+  - !include "{{qt/qtbase}}/cmake_build_standalone_examples_target.yaml"
   - !include "{{qt/qtbase}}/qmake/get_qmake_location_target.yaml"
   - !include "{{qt/qtbase}}/qmake_examples/build_qmake_examples_instructions.yaml"