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-17 09:34:39 +0200
commit6cc9c921cb471497a4637532abc68ab59cf7d126 (patch)
tree251f5cb4247271171fae958b107e9bf4ef90792c /coin/conan
parent26c981f41f30c96a207fb9bc599f0a889ad4b6bb (diff)
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 8ef536b79ec35933ba2d8c03eadf926f75d5f9ee)
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-mingw4
-rw-r--r--coin/conan/profiles/windows-x86_64-msvc2019_643
13 files changed, 14 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 1d93d0de..db8e4248 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 b576d91c..89265ee2 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 415902b9..5e0032be 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 81dab910..942a661d 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 e9bd7a64..29890732 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 c6480857..ab3e277b 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 9dd6c9ee..eea15b46 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 f5ef8541..56838717 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..bed8f9e8 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
@@ -20,3 +19,4 @@ qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEAT
[build_requires]
[env]
CONAN_CMAKE_GENERATOR=Ninja
+
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