From ae62d908a5945900b11451d694e0c784e635b987 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 20 May 2022 15:09:16 +0200 Subject: [PATCH] CMake: Move all CMake Coin builds to be out-of-source Cross-builds already were out-of-source. Move non-cross-builds to out-of-source as well. Fixes: QTBUG-82820 Fixes: QTBUG-96513 Change-Id: I5bef08f18a16e51fe2c501565699494b46546f84 Reviewed-by: Alexandru Croitor --- coin/instructions/cmake_module_build_instructions.yaml | 6 +++++- coin/instructions/cmake_qtbase_build_instructions.yaml | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index de3bbab0308..80dc075eb5c 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -1,9 +1,13 @@ type: Group instructions: + - type: ChangeDirectory + directory: "{{.SourceDir}}" - type: MakeDirectory directory: .git + - type: MakeDirectory + directory: "{{.SourceDir}}_build" - type: SetBuildDirectory - directory: "{{.SourceDir}}" + directory: "{{.SourceDir}}_build" - type: ChangeDirectory directory: "{{.BuildDir}}" diff --git a/coin/instructions/cmake_qtbase_build_instructions.yaml b/coin/instructions/cmake_qtbase_build_instructions.yaml index 10509eac43f..a17077408ee 100644 --- a/coin/instructions/cmake_qtbase_build_instructions.yaml +++ b/coin/instructions/cmake_qtbase_build_instructions.yaml @@ -1,9 +1,13 @@ type: Group instructions: + - type: ChangeDirectory + directory: "{{.SourceDir}}" - type: MakeDirectory directory: .git + - type: MakeDirectory + directory: "{{.SourceDir}}_build" - type: SetBuildDirectory - directory: "{{.SourceDir}}" + directory: "{{.SourceDir}}_build" - type: ChangeDirectory directory: "{{.BuildDir}}"