From 876622c3e2702610ff8e26adc773441c07afb52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 30 Aug 2024 12:38:38 +0200 Subject: [PATCH] coin: Prepare building environment for documentation warning build So that we don't rely on building/running Qt auto tests just to build the docs. Change-Id: If3939717c57e8d4074afe0d611a1d04e65da7d36 Reviewed-by: Toni Saario --- coin/instructions/coin_module_test_docs.yaml | 3 +++ coin/instructions/coin_qtbase_test_docs.yaml | 3 +++ 2 files changed, 6 insertions(+) diff --git a/coin/instructions/coin_module_test_docs.yaml b/coin/instructions/coin_module_test_docs.yaml index 1871ab3fbd9..942bdbb2b03 100644 --- a/coin/instructions/coin_module_test_docs.yaml +++ b/coin/instructions/coin_module_test_docs.yaml @@ -15,12 +15,15 @@ instructions: userMessageOnFailure: > Failed to create links to provisioned binaries. + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS variableValue: "-DQT_BUILD_TESTS=OFF {{.Env.COIN_DOC_CMAKE_ARGS}}" - type: EnvironmentVariable variableName: CONFIGURE_ENV_PREFIX variableValue: "{{.Env.ENV_PREFIX}}" + - !include "{{qt/qtbase}}/call_configure_module.yaml" - type: ExecuteCommand diff --git a/coin/instructions/coin_qtbase_test_docs.yaml b/coin/instructions/coin_qtbase_test_docs.yaml index 2498f9b3931..2c46001cc3f 100644 --- a/coin/instructions/coin_qtbase_test_docs.yaml +++ b/coin/instructions/coin_qtbase_test_docs.yaml @@ -15,6 +15,8 @@ instructions: userMessageOnFailure: > Failed to create links to provisioned binaries. + - !include "{{qt/qtbase}}/prepare_building_env.yaml" + - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS # Use unix separators even on Windows, to avoid escaping issues in the configure script. @@ -22,6 +24,7 @@ instructions: - type: EnvironmentVariable variableName: CONFIGURE_ENV_PREFIX variableValue: "{{.Env.ENV_PREFIX}}" + - !include "{{qt/qtbase}}/call_configure_qtbase.yaml" - type: ExecuteCommand