diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-08 21:12:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-07-08 21:14:18 +0200 |
| commit | 946fc92d20e720a82236877a378ce1c883533aa0 (patch) | |
| tree | 3b2f0c209aacb8acca6a8154826f0f7a4db987a0 /coin | |
| parent | f94155542044904a0fafd7e324ac50d351a7dd35 (diff) | |
Revert "CMake: Propagate configure args to all repositories"
This reverts commit adbadc57df9f70ee4144f0dd2425192593656394.
The change breaks building of repos other than qtbase when
cross-compiling to Android. Not sure yet why.
Change-Id: I6a6efef5360ed141c0c5056afb03b1a0d90439ae
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'coin')
| -rw-r--r-- | coin/instructions/cmake_cross_compilation_module_build_instructions.yaml | 4 | ||||
| -rw-r--r-- | coin/instructions/cmake_module_build_instructions.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml index c3ff648443..5d8f5e9c15 100644 --- a/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml +++ b/coin/instructions/cmake_cross_compilation_module_build_instructions.yaml @@ -16,7 +16,7 @@ instructions: directory: "{{.BuildDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "{{.Env.CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" + variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_host_cmake.yaml" - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" @@ -41,7 +41,7 @@ instructions: directory: "{{.BuildDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "{{.Env.TARGET_CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" + variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_target_cmake.yaml" - type: ExecuteCommand command: "{{.Env.TARGET_ENV_PREFIX}} cmake --build . --parallel -v" diff --git a/coin/instructions/cmake_module_build_instructions.yaml b/coin/instructions/cmake_module_build_instructions.yaml index 93044059f2..b6c72bf23f 100644 --- a/coin/instructions/cmake_module_build_instructions.yaml +++ b/coin/instructions/cmake_module_build_instructions.yaml @@ -8,7 +8,7 @@ instructions: directory: "{{.BuildDir}}" - type: EnvironmentVariable variableName: COIN_CMAKE_ARGS - variableValue: "{{.Env.CONFIGURE_ARGS}} -DBUILD_TESTING=OFF {{.SourceDir}}" + variableValue: "-DBUILD_TESTING=OFF {{.SourceDir}}" - !include "{{qt/qtbase}}/call_cmake.yaml" - type: ExecuteCommand command: "{{.Env.ENV_PREFIX}} cmake --build . --parallel -v" |