From 946fc92d20e720a82236877a378ce1c883533aa0 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Wed, 8 Jul 2020 21:12:25 +0200 Subject: 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 --- .../cmake_cross_compilation_module_build_instructions.yaml | 4 ++-- coin/instructions/cmake_module_build_instructions.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'coin') 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" -- cgit v1.2.3