Conan: Update build profiles

Remove mutually exclusive options.

Set the 'build_type' correctly so that it reflects the used build
Options.

Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 8ef536b79e)
This commit is contained in:
Iikka Eklund
2021-10-25 11:58:53 +03:00
parent 26c981f41f
commit 6cc9c921cb
13 changed files with 14 additions and 15 deletions

View File

@@ -4,7 +4,7 @@
compiler=clang
compiler.version=10
compiler.libcxx=libstdc++
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=no

View File

@@ -4,7 +4,7 @@
compiler=gcc
compiler.version=9.3
compiler.libcxx=libstdc++11
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=apple-clang
compiler.version=12.0
compiler.libcxx=libc++
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -5,7 +5,7 @@
compiler=clang
compiler.version=11
compiler.libcxx=c++_shared
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes

View File

@@ -4,9 +4,8 @@
compiler=gcc
compiler.version=8.1
compiler.libcxx=libstdc++
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:debug_and_release=yes
qtbase:force_debug_info=yes
@@ -20,3 +19,4 @@ qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEAT
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja

View File

@@ -6,9 +6,8 @@
compiler.cppstd=17
compiler.runtime=dynamic
compiler.runtime_type=Release
build_type=Release
build_type=RelWithDebInfo
[options]
qtbase:release=yes
qtbase:shared=yes
qtbase:nomake=tests
qtbase:debug_and_release=yes