aboutsummaryrefslogtreecommitdiffstats
path: root/coin/conan
diff options
context:
space:
mode:
authorIikka Eklund <iikka.eklund@qt.io>2021-10-25 11:58:53 +0300
committerIikka Eklund <iikka.eklund@qt.io>2021-11-08 08:23:24 +0000
commit8ef536b79ec35933ba2d8c03eadf926f75d5f9ee (patch)
treec93f5b77a4ecee2d360ef3654be25f9f36e72c4d /coin/conan
parent9011988e3836f6e6b22764ef8b4a12a6550d35e4 (diff)
Conan: Update build profiles
Remove mutually exclusive options. Set the 'build_type' correctly so that it reflects the used build Options. Pick-to: 6.2 Change-Id: I40b139898d722583c0fc245f3f8c60657a42d26a Reviewed-by: Toni Saario <toni.saario@qt.io>
Diffstat (limited to 'coin/conan')
-rw-r--r--coin/conan/profiles/linux-webassembly-x86_64-gcc2
-rw-r--r--coin/conan/profiles/linux-x86_64-gcc2
-rw-r--r--coin/conan/profiles/macos-universal-clang2
-rw-r--r--coin/conan/profiles/unix-android-arm64-clang2
-rw-r--r--coin/conan/profiles/unix-android-armv7-clang2
-rw-r--r--coin/conan/profiles/unix-android-x86-clang2
-rw-r--r--coin/conan/profiles/unix-android-x86_64-clang2
-rw-r--r--coin/conan/profiles/windows-android-arm64-clang2
-rw-r--r--coin/conan/profiles/windows-android-armv7-clang2
-rw-r--r--coin/conan/profiles/windows-android-x86-clang2
-rw-r--r--coin/conan/profiles/windows-android-x86_64-clang2
-rw-r--r--coin/conan/profiles/windows-x86_64-mingw3
-rw-r--r--coin/conan/profiles/windows-x86_64-msvc2019_643
13 files changed, 13 insertions, 15 deletions
diff --git a/coin/conan/profiles/linux-webassembly-x86_64-gcc b/coin/conan/profiles/linux-webassembly-x86_64-gcc
index f5120e9e..ee05a48b 100644
--- a/coin/conan/profiles/linux-webassembly-x86_64-gcc
+++ b/coin/conan/profiles/linux-webassembly-x86_64-gcc
@@ -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
diff --git a/coin/conan/profiles/linux-x86_64-gcc b/coin/conan/profiles/linux-x86_64-gcc
index 12692b62..d94ac71e 100644
--- a/coin/conan/profiles/linux-x86_64-gcc
+++ b/coin/conan/profiles/linux-x86_64-gcc
@@ -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
diff --git a/coin/conan/profiles/macos-universal-clang b/coin/conan/profiles/macos-universal-clang
index 47d6c031..0a154683 100644
--- a/coin/conan/profiles/macos-universal-clang
+++ b/coin/conan/profiles/macos-universal-clang
@@ -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
diff --git a/coin/conan/profiles/unix-android-arm64-clang b/coin/conan/profiles/unix-android-arm64-clang
index c2929ee5..89c88de9 100644
--- a/coin/conan/profiles/unix-android-arm64-clang
+++ b/coin/conan/profiles/unix-android-arm64-clang
@@ -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
diff --git a/coin/conan/profiles/unix-android-armv7-clang b/coin/conan/profiles/unix-android-armv7-clang
index c06f1eb1..8feb5d42 100644
--- a/coin/conan/profiles/unix-android-armv7-clang
+++ b/coin/conan/profiles/unix-android-armv7-clang
@@ -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
diff --git a/coin/conan/profiles/unix-android-x86-clang b/coin/conan/profiles/unix-android-x86-clang
index e2dcfbc1..74dc477d 100644
--- a/coin/conan/profiles/unix-android-x86-clang
+++ b/coin/conan/profiles/unix-android-x86-clang
@@ -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
diff --git a/coin/conan/profiles/unix-android-x86_64-clang b/coin/conan/profiles/unix-android-x86_64-clang
index a80888ad..fd31c742 100644
--- a/coin/conan/profiles/unix-android-x86_64-clang
+++ b/coin/conan/profiles/unix-android-x86_64-clang
@@ -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
diff --git a/coin/conan/profiles/windows-android-arm64-clang b/coin/conan/profiles/windows-android-arm64-clang
index 3645cab0..20abef1e 100644
--- a/coin/conan/profiles/windows-android-arm64-clang
+++ b/coin/conan/profiles/windows-android-arm64-clang
@@ -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
diff --git a/coin/conan/profiles/windows-android-armv7-clang b/coin/conan/profiles/windows-android-armv7-clang
index 518d5f1d..b3dcb397 100644
--- a/coin/conan/profiles/windows-android-armv7-clang
+++ b/coin/conan/profiles/windows-android-armv7-clang
@@ -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
diff --git a/coin/conan/profiles/windows-android-x86-clang b/coin/conan/profiles/windows-android-x86-clang
index d146ea9f..0c9ea29a 100644
--- a/coin/conan/profiles/windows-android-x86-clang
+++ b/coin/conan/profiles/windows-android-x86-clang
@@ -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
diff --git a/coin/conan/profiles/windows-android-x86_64-clang b/coin/conan/profiles/windows-android-x86_64-clang
index 0a8818a5..766da776 100644
--- a/coin/conan/profiles/windows-android-x86_64-clang
+++ b/coin/conan/profiles/windows-android-x86_64-clang
@@ -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
diff --git a/coin/conan/profiles/windows-x86_64-mingw b/coin/conan/profiles/windows-x86_64-mingw
index 2740ae9e..484107ed 100644
--- a/coin/conan/profiles/windows-x86_64-mingw
+++ b/coin/conan/profiles/windows-x86_64-mingw
@@ -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
diff --git a/coin/conan/profiles/windows-x86_64-msvc2019_64 b/coin/conan/profiles/windows-x86_64-msvc2019_64
index b24160ce..d0ec091e 100644
--- a/coin/conan/profiles/windows-x86_64-msvc2019_64
+++ b/coin/conan/profiles/windows-x86_64-msvc2019_64
@@ -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