diff options
Diffstat (limited to 'coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml')
-rw-r--r-- | coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml index 5a14ee0b87..6a51bdc975 100644 --- a/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_qtbase_build_instructions.yaml @@ -27,21 +27,14 @@ instructions: maxTimeBetweenOutput: 1200 userMessageOnFailure: > Failed to build sources. In the current state bug can be everywhere. - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --install ." - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to install package. + - type: EnvironmentVariable + variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH + variableValue: "{{.BuildDir}}" + - !include "{{qt/qtbase}}/call_host_install.yaml" - type: EnvironmentVariable variableName: DESTDIR variableValue: "{{.InstallRoot}}" - - type: ExecuteCommand - command: "{{.Env.ENV_PREFIX}} cmake --install ." - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to install package for archiving. + - !include "{{qt/qtbase}}/call_host_install.yaml" - type: EnvironmentVariable variableName: DESTDIR variableValue: "" @@ -62,21 +55,14 @@ instructions: maxTimeBetweenOutput: 1200 userMessageOnFailure: > Failed to build sources. In the current state bug can be everywhere. - - type: ExecuteCommand - command: "{{.Env.TARGET_ENV_PREFIX}} cmake --install ." - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to install package. + - type: EnvironmentVariable + variableName: COIN_CMAKE_INSTALL_SCRIPT_PATH + variableValue: "{{.BuildDir}}" + - !include "{{qt/qtbase}}/call_target_install.yaml" - type: EnvironmentVariable variableName: DESTDIR variableValue: "{{.InstallRoot}}" - - type: ExecuteCommand - command: "{{.Env.TARGET_ENV_PREFIX}} cmake --install ." - maxTimeInSeconds: 6000 - maxTimeBetweenOutput: 1200 - userMessageOnFailure: > - Failed to install package for archiving. + - !include "{{qt/qtbase}}/call_target_install.yaml" - type: EnvironmentVariable variableName: DESTDIR variableValue: "" |