diff options
author | Toni Saario <toni.saario@qt.io> | 2021-11-12 11:29:11 +0200 |
---|---|---|
committer | Iikka Eklund <iikka.eklund@qt.io> | 2022-02-28 07:43:41 +0000 |
commit | 28920cb7b4d5d0b729135939b3f03a4281848caf (patch) | |
tree | 2b61b9ceff8e308ded31e76df1794aee1ac151f7 /coin | |
parent | a4cc949b8dbfa2f21c323fd7cbffd011b2dbbc84 (diff) |
Update conan profiles
Split the end user profile variants in two, e.g.:
linux-x86_64-gcc
->
linux-x86_64-gcc # 1
baseprofiles/linux-x86_64-gcc # 2
1) This is still the end user variant but this includes the
counterpart from 3rdparty subfolder
2) This contains those settings and options that are needed
for 3rd party depedencies like icu
Task-number: QTBUG-99213
Pick-to: 6.2 6.3
Change-Id: Ia6d7d9c5759848ff339cf8f50a40b10dfd9877d6
Reviewed-by: Simo Fält <simo.falt@qt.io>
Diffstat (limited to 'coin')
61 files changed, 345 insertions, 247 deletions
diff --git a/coin/conan/profiles/baseprofiles/android-arm64-clang b/coin/conan/profiles/baseprofiles/android-arm64-clang new file mode 100644 index 00000000..ab7f0155 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/android-arm64-clang @@ -0,0 +1,10 @@ +[settings] + os=Android + os.api_level=8 + arch=armv8 + compiler=clang + compiler.version=11 + compiler.libcxx=c++_shared + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/android-armv7-clang b/coin/conan/profiles/baseprofiles/android-armv7-clang new file mode 100644 index 00000000..2512d2e3 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/android-armv7-clang @@ -0,0 +1,10 @@ +[settings] + os=Android + os.api_level=8 + arch=armv7 + compiler=clang + compiler.version=11 + compiler.libcxx=c++_shared + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/android-x86-clang b/coin/conan/profiles/baseprofiles/android-x86-clang new file mode 100644 index 00000000..765dea62 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/android-x86-clang @@ -0,0 +1,10 @@ +[settings] + os=Android + os.api_level=8 + arch=x86 + compiler=clang + compiler.version=11 + compiler.libcxx=c++_shared + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/android-x86_64-clang b/coin/conan/profiles/baseprofiles/android-x86_64-clang new file mode 100644 index 00000000..a750ab01 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/android-x86_64-clang @@ -0,0 +1,10 @@ +[settings] + os=Android + os.api_level=8 + arch=x86_64 + compiler=clang + compiler.version=11 + compiler.libcxx=c++_shared + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/linux-webassembly-x86_64-clang b/coin/conan/profiles/baseprofiles/linux-webassembly-x86_64-clang new file mode 100644 index 00000000..5b6edb6d --- /dev/null +++ b/coin/conan/profiles/baseprofiles/linux-webassembly-x86_64-clang @@ -0,0 +1,9 @@ +[settings] + os=Emscripten + arch=wasm + compiler=clang + compiler.version=10 + compiler.libcxx=libstdc++ + build_type=Release +[options] +*:shared=False diff --git a/coin/conan/profiles/baseprofiles/linux-x86_64-gcc b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc new file mode 100644 index 00000000..65bc7a7e --- /dev/null +++ b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc @@ -0,0 +1,9 @@ +[settings] + os=Linux + arch=x86_64 + compiler=gcc + compiler.version=9.3 + compiler.libcxx=libstdc++11 + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/linux-x86_64-gcc-debug-developer b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc-debug-developer new file mode 100644 index 00000000..7b023dbd --- /dev/null +++ b/coin/conan/profiles/baseprofiles/linux-x86_64-gcc-debug-developer @@ -0,0 +1,9 @@ +[settings] + os=Linux + arch=x86_64 + compiler=gcc + compiler.version=9.3 + compiler.libcxx=libstdc++11 + build_type=Debug +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/macos-ios-arm64-clang b/coin/conan/profiles/baseprofiles/macos-ios-arm64-clang new file mode 100644 index 00000000..99f44206 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/macos-ios-arm64-clang @@ -0,0 +1,10 @@ +[settings] + os=iOS + os.version=13.0 + arch=armv8 + compiler=apple-clang + compiler.version=11.0 + compiler.libcxx=libc++ + build_type=Release +[options] +*:shared=False diff --git a/coin/conan/profiles/baseprofiles/macos-universal-clang b/coin/conan/profiles/baseprofiles/macos-universal-clang new file mode 100644 index 00000000..dbcb4ca2 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/macos-universal-clang @@ -0,0 +1,10 @@ +[settings] + os=Macos + os.version=11.0 + arch=x86_64 + compiler=apple-clang + compiler.version=12.0 + compiler.libcxx=libc++ + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/macos-webassembly-x86_64-clang b/coin/conan/profiles/baseprofiles/macos-webassembly-x86_64-clang new file mode 100644 index 00000000..5b6edb6d --- /dev/null +++ b/coin/conan/profiles/baseprofiles/macos-webassembly-x86_64-clang @@ -0,0 +1,9 @@ +[settings] + os=Emscripten + arch=wasm + compiler=clang + compiler.version=10 + compiler.libcxx=libstdc++ + build_type=Release +[options] +*:shared=False diff --git a/coin/conan/profiles/baseprofiles/windows-arm64-msvc2019_64 b/coin/conan/profiles/baseprofiles/windows-arm64-msvc2019_64 new file mode 100644 index 00000000..3b02d2ec --- /dev/null +++ b/coin/conan/profiles/baseprofiles/windows-arm64-msvc2019_64 @@ -0,0 +1,11 @@ +[settings] + os=Windows + arch=armv8 + compiler=msvc + compiler.version=19.28 + compiler.cppstd=17 + compiler.runtime=dynamic + compiler.runtime_type=Release + build_type=Release +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/windows-webassembly-x86_64-clang b/coin/conan/profiles/baseprofiles/windows-webassembly-x86_64-clang new file mode 100644 index 00000000..34670885 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/windows-webassembly-x86_64-clang @@ -0,0 +1,9 @@ +[settings] + os=Emscripten + arch=wasm + compiler=clang + compiler.version=10 + compiler.libcxx=libstdc++ + build_type=RelWithDebInfo +[options] +*:shared=False diff --git a/coin/conan/profiles/baseprofiles/windows-x86_64-mingw b/coin/conan/profiles/baseprofiles/windows-x86_64-mingw new file mode 100644 index 00000000..0e416548 --- /dev/null +++ b/coin/conan/profiles/baseprofiles/windows-x86_64-mingw @@ -0,0 +1,9 @@ +[settings] + os=Windows + arch=x86_64 + compiler=gcc + compiler.version=11 + compiler.libcxx=libstdc++ + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64 b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64 new file mode 100644 index 00000000..541b5ffc --- /dev/null +++ b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64 @@ -0,0 +1,11 @@ +[settings] + os=Windows + arch=x86_64 + compiler=msvc + compiler.version=19.28 + compiler.cppstd=17 + compiler.runtime=dynamic + compiler.runtime_type=Release + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64-developer b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64-developer new file mode 100644 index 00000000..541b5ffc --- /dev/null +++ b/coin/conan/profiles/baseprofiles/windows-x86_64-msvc2019_64-developer @@ -0,0 +1,11 @@ +[settings] + os=Windows + arch=x86_64 + compiler=msvc + compiler.version=19.28 + compiler.cppstd=17 + compiler.runtime=dynamic + compiler.runtime_type=Release + build_type=RelWithDebInfo +[options] +*:shared=True diff --git a/coin/conan/profiles/ci-linux-webassembly-x86_64-gcc b/coin/conan/profiles/ci-linux-webassembly-x86_64-clang index 07554e39..fd882af5 100644 --- a/coin/conan/profiles/ci-linux-webassembly-x86_64-gcc +++ b/coin/conan/profiles/ci-linux-webassembly-x86_64-clang @@ -1,4 +1,4 @@ -include(linux-webassembly-x86_64-gcc) +include(./linux-webassembly-x86_64-clang) [options] qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-linux-x86_64-gcc b/coin/conan/profiles/ci-linux-x86_64-gcc index a7214f59..aad823d4 100644 --- a/coin/conan/profiles/ci-linux-x86_64-gcc +++ b/coin/conan/profiles/ci-linux-x86_64-gcc @@ -1,6 +1,6 @@ -include(linux-x86_64-gcc) +include(./linux-x86_64-gcc) [options] -qtbase:headersclean=yes +qtbase:headersclean=True qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-linux-developer-x86_64-gcc b/coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer index da331152..759fa629 100644 --- a/coin/conan/profiles/ci-linux-developer-x86_64-gcc +++ b/coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer @@ -1,4 +1,4 @@ -include(linux-developer-x86_64-gcc) +include(./linux-x86_64-gcc-debug-developer) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-macos-ios-arm64-clang b/coin/conan/profiles/ci-macos-ios-arm64-clang index b5238b98..5e2848c9 100644 --- a/coin/conan/profiles/ci-macos-ios-arm64-clang +++ b/coin/conan/profiles/ci-macos-ios-arm64-clang @@ -1 +1 @@ -include(macos-ios-arm64-clang) +include(./macos-ios-arm64-clang) diff --git a/coin/conan/profiles/ci-macos-universal-clang b/coin/conan/profiles/ci-macos-universal-clang index 7ca313cb..a08572ae 100644 --- a/coin/conan/profiles/ci-macos-universal-clang +++ b/coin/conan/profiles/ci-macos-universal-clang @@ -1,6 +1,6 @@ -include(macos-universal-clang) +include(./macos-universal-clang) [options] -qtbase:headersclean=yes +qtbase:headersclean=True qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT=$POSTGRESQLBINPATH/..' *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-macos-webassembly-x86_64-clang b/coin/conan/profiles/ci-macos-webassembly-x86_64-clang new file mode 100644 index 00000000..ad273d36 --- /dev/null +++ b/coin/conan/profiles/ci-macos-webassembly-x86_64-clang @@ -0,0 +1,5 @@ +include(./macos-webassembly-x86_64-clang) + +[options] +qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-unix-android-arm64-clang b/coin/conan/profiles/ci-unix-android-arm64-clang index 7dbd4c10..afd47468 100644 --- a/coin/conan/profiles/ci-unix-android-arm64-clang +++ b/coin/conan/profiles/ci-unix-android-arm64-clang @@ -1,4 +1,4 @@ -include(unix-android-arm64-clang) +include(./android-arm64-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-unix-android-armv7-clang b/coin/conan/profiles/ci-unix-android-armv7-clang index f37a5616..e8b892de 100644 --- a/coin/conan/profiles/ci-unix-android-armv7-clang +++ b/coin/conan/profiles/ci-unix-android-armv7-clang @@ -1,4 +1,4 @@ -include(unix-android-armv7-clang) +include(./android-armv7-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-unix-android-x86-clang b/coin/conan/profiles/ci-unix-android-x86-clang index 1dfa600a..f37d6a29 100644 --- a/coin/conan/profiles/ci-unix-android-x86-clang +++ b/coin/conan/profiles/ci-unix-android-x86-clang @@ -1,4 +1,4 @@ -include(unix-android-x86-clang) +include(./android-x86-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-unix-android-x86_64-clang b/coin/conan/profiles/ci-unix-android-x86_64-clang index f5ec0daa..39201c75 100644 --- a/coin/conan/profiles/ci-unix-android-x86_64-clang +++ b/coin/conan/profiles/ci-unix-android-x86_64-clang @@ -1,4 +1,4 @@ -include(unix-android-x86_64-clang) +include(./android-x86_64-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=$OPENSSL_ANDROID_HOME -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_ROOT/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-android-arm64-clang b/coin/conan/profiles/ci-windows-android-arm64-clang index dab1e537..754d500c 100644 --- a/coin/conan/profiles/ci-windows-android-arm64-clang +++ b/coin/conan/profiles/ci-windows-android-arm64-clang @@ -1,4 +1,4 @@ -include(windows-android-arm64-clang) +include(./android-arm64-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-android-armv7-clang b/coin/conan/profiles/ci-windows-android-armv7-clang index ddeab0a4..a99e30da 100644 --- a/coin/conan/profiles/ci-windows-android-armv7-clang +++ b/coin/conan/profiles/ci-windows-android-armv7-clang @@ -1,4 +1,4 @@ -include(windows-android-armv7-clang) +include(./android-armv7-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-android-x86-clang b/coin/conan/profiles/ci-windows-android-x86-clang index 165b0ae1..8d32a6ae 100644 --- a/coin/conan/profiles/ci-windows-android-x86-clang +++ b/coin/conan/profiles/ci-windows-android-x86-clang @@ -1,4 +1,4 @@ -include(windows-android-x86-clang) +include(./android-x86-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-android-x86_64-clang b/coin/conan/profiles/ci-windows-android-x86_64-clang index 12819b00..714509eb 100644 --- a/coin/conan/profiles/ci-windows-android-x86_64-clang +++ b/coin/conan/profiles/ci-windows-android-x86_64-clang @@ -1,4 +1,4 @@ -include(windows-android-x86_64-clang) +include(./android-x86_64-clang) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_ANDROID_HOME% -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-arm64-msvc2019_64 b/coin/conan/profiles/ci-windows-arm64-msvc2019_64 index 66290766..cdc2a414 100644 --- a/coin/conan/profiles/ci-windows-arm64-msvc2019_64 +++ b/coin/conan/profiles/ci-windows-arm64-msvc2019_64 @@ -1,4 +1,4 @@ -include(windows-arm64-msvc2019_64) +include(./windows-arm64-msvc2019_64) qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DFEATURE_msvc_obj_debug_info=ON" *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-webassembly-x86_64-clang b/coin/conan/profiles/ci-windows-webassembly-x86_64-clang new file mode 100644 index 00000000..96020590 --- /dev/null +++ b/coin/conan/profiles/ci-windows-webassembly-x86_64-clang @@ -0,0 +1,5 @@ +include(./windows-webassembly-x86_64-clang) + +[options] +qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-x86_64-mingw b/coin/conan/profiles/ci-windows-x86_64-mingw index a36bbd35..931d5413 100644 --- a/coin/conan/profiles/ci-windows-x86_64-mingw +++ b/coin/conan/profiles/ci-windows-x86_64-mingw @@ -1,4 +1,4 @@ -include(windows-x86_64-mingw) +include(./windows-x86_64-mingw) [options] qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.." diff --git a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64 b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64 index 2bf31be0..2797fe58 100644 --- a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64 +++ b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64 @@ -1,7 +1,7 @@ -include(windows-x86_64-msvc2019_64) +include(./windows-x86_64-msvc2019_64) [options] -qtbase:headersclean=yes +qtbase:headersclean=True qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DPostgreSQL_ROOT=%POSTGRESQL_LIB_x64%\.. -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" *:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" diff --git a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer new file mode 100644 index 00000000..0427e86e --- /dev/null +++ b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer @@ -0,0 +1,7 @@ +include(./windows-x86_64-msvc2019_64-developer) + +[options] +qtbase:headersclean=True +qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR=%OPENSSL_INCLUDE_x64%\.. -DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" + diff --git a/coin/conan/profiles/linux-developer-x86_64-gcc b/coin/conan/profiles/linux-developer-x86_64-gcc deleted file mode 100644 index c954db8e..00000000 --- a/coin/conan/profiles/linux-developer-x86_64-gcc +++ /dev/null @@ -1,17 +0,0 @@ -[settings] - os=Linux - arch=x86_64 - compiler=gcc - compiler.version=9.3 - compiler.libcxx=libstdc++11 - build_type=Release -[options] -qtbase:release=yes -qtbase:shared=yes -qtbase:nomake=tests;examples -qtbase:developer_build=yes -qtbase:cmake_args_qtbase="" -*:cmake_args_leaf_module="" -[build_requires] -[env] -CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/conan/profiles/linux-webassembly-x86_64-gcc b/coin/conan/profiles/linux-webassembly-x86_64-clang index 79d830a0..dc8279bb 100644 --- a/coin/conan/profiles/linux-webassembly-x86_64-gcc +++ b/coin/conan/profiles/linux-webassembly-x86_64-clang @@ -1,16 +1,9 @@ -[settings] - os=Emscripten - arch=wasm - compiler=clang - compiler.version=10 - compiler.libcxx=libstdc++ - build_type=RelWithDebInfo +include(baseprofiles/linux-webassembly-x86_64-clang) + [options] -qtbase:release=yes -qtbase:shared=no +qtbase:release=True qtbase:qt_host_path=$QT_HOST_PATH qtbase:nomake=examples;tests -qtbase:force_debug_info=yes qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten" *:cmake_args_leaf_module="" [build_requires] diff --git a/coin/conan/profiles/linux-x86_64-gcc b/coin/conan/profiles/linux-x86_64-gcc index 4ed89008..7f6b20ff 100644 --- a/coin/conan/profiles/linux-x86_64-gcc +++ b/coin/conan/profiles/linux-x86_64-gcc @@ -1,22 +1,17 @@ -[settings] - os=Linux - arch=x86_64 - compiler=gcc - compiler.version=9.3 - compiler.libcxx=libstdc++11 - build_type=RelWithDebInfo +include(baseprofiles/linux-x86_64-gcc) + [options] -qtbase:release=yes -qtbase:shared=yes +qtbase:release=True qtbase:nomake=tests;examples -qtbase:separate_debug_info=yes -qtbase:force_debug_info=yes -qtbase:bundled_xcb_xinput=yes -qtbase:libudev=no +qtbase:separate_debug_info=True +qtbase:force_debug_info=True +qtbase:bundled_xcb_xinput=True +qtbase:libudev=False qtbase:doubleconversion=qt qtbase:pcre=qt qtbase:libjpeg=qt qtbase:libpng=qt +qtbase:icu=True qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DOpenGL_GL_PREFERENCE=LEGACY -DFEATURE_system_harfbuzz=OFF" *:cmake_args_leaf_module="" [build_requires] diff --git a/coin/conan/profiles/linux-x86_64-gcc-debug-developer b/coin/conan/profiles/linux-x86_64-gcc-debug-developer new file mode 100644 index 00000000..a1b9c10e --- /dev/null +++ b/coin/conan/profiles/linux-x86_64-gcc-debug-developer @@ -0,0 +1,11 @@ +include(baseprofiles/linux-x86_64-gcc-debug-developer) + +[options] +qtbase:debug=True +qtbase:nomake=tests;examples +qtbase:developer_build=True +qtbase:cmake_args_qtbase="" +*:cmake_args_leaf_module="" +[build_requires] +[env] +CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/conan/profiles/macos-ios-arm64-clang b/coin/conan/profiles/macos-ios-arm64-clang index aeda7ad4..1f227225 100644 --- a/coin/conan/profiles/macos-ios-arm64-clang +++ b/coin/conan/profiles/macos-ios-arm64-clang @@ -1,17 +1,11 @@ -[settings] - os=iOS - os.version=13.0 - arch=armv8 - compiler=apple-clang - compiler.version=11.0 - compiler.libcxx=libc++ - build_type=Release +include(baseprofiles/macos-ios-arm64-clang) + [options] -qtbase:shared=no -qtbase:debug_and_release=yes +qtbase:debug_and_release=True qtbase:nomake=examples;tests qtbase:qt_host_path=$QT_HOST_PATH qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=iOS" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/conan/profiles/macos-universal-clang b/coin/conan/profiles/macos-universal-clang index 2bc69dce..bb85a2fd 100644 --- a/coin/conan/profiles/macos-universal-clang +++ b/coin/conan/profiles/macos-universal-clang @@ -1,18 +1,11 @@ -[settings] - os=Macos - os.version=11.0 - arch=x86_64 - compiler=apple-clang - compiler.version=12.0 - compiler.libcxx=libc++ - build_type=RelWithDebInfo +include(baseprofiles/macos-universal-clang) + [options] -qtbase:release=yes -qtbase:shared=yes +qtbase:release=True qtbase:nomake=examples;tests -qtbase:force_debug_info=yes -qtbase:separate_debug_info=yes -qtbase:framework=yes +qtbase:force_debug_info=True +qtbase:separate_debug_info=True +qtbase:framework=True qtbase:cmake_args_qtbase='-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DODBC_ROOT=/usr/local/opt/libiodbc' *:cmake_args_leaf_module="" [build_requires] diff --git a/coin/conan/profiles/macos-webassembly-x86_64-clang b/coin/conan/profiles/macos-webassembly-x86_64-clang new file mode 100644 index 00000000..85d146ce --- /dev/null +++ b/coin/conan/profiles/macos-webassembly-x86_64-clang @@ -0,0 +1,11 @@ +include(baseprofiles/macos-webassembly-x86_64-clang) + +[options] +qtbase:release=True +qtbase:qt_host_path=$QT_HOST_PATH +qtbase:nomake=examples;tests +qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten" +*:cmake_args_leaf_module="" +[build_requires] +[env] +CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/conan/profiles/unix-android-arm64-clang b/coin/conan/profiles/unix-android-arm64-clang index 31142b6d..a8547c8b 100644 --- a/coin/conan/profiles/unix-android-arm64-clang +++ b/coin/conan/profiles/unix-android-arm64-clang @@ -1,15 +1,8 @@ -[settings] - os=Android - os.api_level=8 - arch=armv8 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/unix-android-arm64-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=$QT_HOST_PATH qtbase:platform=android-clang diff --git a/coin/conan/profiles/unix-android-armv7-clang b/coin/conan/profiles/unix-android-armv7-clang index aae295cd..48c66e75 100644 --- a/coin/conan/profiles/unix-android-armv7-clang +++ b/coin/conan/profiles/unix-android-armv7-clang @@ -1,15 +1,8 @@ -[settings] - os=Android - os.api_level=8 - arch=armv7 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/unix-android-armv7-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=$QT_HOST_PATH qtbase:platform=android-clang diff --git a/coin/conan/profiles/unix-android-x86-clang b/coin/conan/profiles/unix-android-x86-clang index a6a51ca1..312fb17f 100644 --- a/coin/conan/profiles/unix-android-x86-clang +++ b/coin/conan/profiles/unix-android-x86-clang @@ -1,15 +1,8 @@ -[settings] - os=Android - os.api_level=8 - arch=x86 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/unix-android-x86-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=$QT_HOST_PATH qtbase:platform=android-clang diff --git a/coin/conan/profiles/unix-android-x86_64-clang b/coin/conan/profiles/unix-android-x86_64-clang index 0bb58769..ee7173f8 100644 --- a/coin/conan/profiles/unix-android-x86_64-clang +++ b/coin/conan/profiles/unix-android-x86_64-clang @@ -1,15 +1,8 @@ -[settings] - os=Android - os.api_level=8 - arch=x86_64 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/unix-android-x86_64-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=$QT_HOST_PATH qtbase:platform=android-clang diff --git a/coin/conan/profiles/windows-android-arm64-clang b/coin/conan/profiles/windows-android-arm64-clang index 85f9d3e5..d0a2c674 100644 --- a/coin/conan/profiles/windows-android-arm64-clang +++ b/coin/conan/profiles/windows-android-arm64-clang @@ -1,16 +1,9 @@ -[settings] - os=Android - os.api_level=8 - arch=armv8 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/windows-android-arm64-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:pkg_config=no -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:pkg_config=False +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=%QT_HOST_PATH% qtbase:platform=android-clang diff --git a/coin/conan/profiles/windows-android-armv7-clang b/coin/conan/profiles/windows-android-armv7-clang index fae7624f..15df7c81 100644 --- a/coin/conan/profiles/windows-android-armv7-clang +++ b/coin/conan/profiles/windows-android-armv7-clang @@ -1,16 +1,9 @@ -[settings] - os=Android - os.api_level=8 - arch=armv7 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/windows-android-armv7-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:pkg_config=no -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:pkg_config=False +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=%QT_HOST_PATH% qtbase:platform=android-clang diff --git a/coin/conan/profiles/windows-android-x86-clang b/coin/conan/profiles/windows-android-x86-clang index e812a80a..408f7842 100644 --- a/coin/conan/profiles/windows-android-x86-clang +++ b/coin/conan/profiles/windows-android-x86-clang @@ -1,16 +1,9 @@ -[settings] - os=Android - os.api_level=8 - arch=x86 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/windows-android-x86-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:pkg_config=no -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:pkg_config=False +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=%QT_HOST_PATH% qtbase:platform=android-clang diff --git a/coin/conan/profiles/windows-android-x86_64-clang b/coin/conan/profiles/windows-android-x86_64-clang index 0b99efcc..e2201cc8 100644 --- a/coin/conan/profiles/windows-android-x86_64-clang +++ b/coin/conan/profiles/windows-android-x86_64-clang @@ -1,16 +1,9 @@ -[settings] - os=Android - os.api_level=8 - arch=x86_64 - compiler=clang - compiler.version=11 - compiler.libcxx=c++_shared - build_type=RelWithDebInfo +include(baseprofiles/windows-android-x86_64-clang) + [options] -qtbase:release=yes -qtbase:shared=yes -qtbase:pkg_config=no -qtbase:force_debug_info=yes +qtbase:release=True +qtbase:pkg_config=False +qtbase:force_debug_info=True qtbase:nomake=examples;tests qtbase:qt_host_path=%QT_HOST_PATH% qtbase:platform=android-clang diff --git a/coin/conan/profiles/windows-arm64-msvc2019_64 b/coin/conan/profiles/windows-arm64-msvc2019_64 index f7f23eb1..83ef439f 100644 --- a/coin/conan/profiles/windows-arm64-msvc2019_64 +++ b/coin/conan/profiles/windows-arm64-msvc2019_64 @@ -1,15 +1,7 @@ -[settings] - os=Windows - arch=armv8 - compiler=msvc - compiler.version=19.28 - compiler.cppstd=17 - compiler.runtime=dynamic - compiler.runtime_type=Release - build_type=Release +include(baseprofiles/windows-arm64-msvc2019_64) + [options] -qtbase:release=yes -qtbase:shared=yes +qtbase:release=True qtbase:qt_host_path=$QT_HOST_PATH qtbase:nomake=tests qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -DFEATURE_msvc_obj_debug_info=ON" diff --git a/coin/conan/profiles/windows-webassembly-x86_64-clang b/coin/conan/profiles/windows-webassembly-x86_64-clang new file mode 100644 index 00000000..cb41288f --- /dev/null +++ b/coin/conan/profiles/windows-webassembly-x86_64-clang @@ -0,0 +1,12 @@ +include(baseprofiles/windows-webassembly-x86_64-clang) + +[options] +qtbase:release=True +qtbase:qt_host_path=%QT_HOST_PATH% +qtbase:nomake=examples;tests +qtbase:force_debug_info=True +qtbase:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten" +*:cmake_args_leaf_module="-DFEATURE_pkg_config=OFF" +[build_requires] +[env] +CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/conan/profiles/windows-x86_64-mingw b/coin/conan/profiles/windows-x86_64-mingw index 2c0acd87..6a728c7a 100644 --- a/coin/conan/profiles/windows-x86_64-mingw +++ b/coin/conan/profiles/windows-x86_64-mingw @@ -1,15 +1,9 @@ -[settings] - os=Windows - arch=x86_64 - compiler=gcc - compiler.version=8.1 - compiler.libcxx=libstdc++ - build_type=RelWithDebInfo +include(baseprofiles/windows-x86_64-mingw) + [options] -qtbase:shared=yes -qtbase:debug_and_release=yes -qtbase:force_debug_info=yes -qtbase:separate_debug_info=yes +qtbase:release=True +qtbase:force_debug_info=True +qtbase:separate_debug_info=True qtbase:nomake=examples;tests qtbase:zlib=qt qtbase:libjpeg=qt diff --git a/coin/conan/profiles/windows-x86_64-msvc2019_64 b/coin/conan/profiles/windows-x86_64-msvc2019_64 index fde7d75a..a8cd1371 100644 --- a/coin/conan/profiles/windows-x86_64-msvc2019_64 +++ b/coin/conan/profiles/windows-x86_64-msvc2019_64 @@ -1,17 +1,9 @@ -[settings] - os=Windows - arch=x86_64 - compiler=msvc - compiler.version=19.28 - compiler.cppstd=17 - compiler.runtime=dynamic - compiler.runtime_type=Release - build_type=RelWithDebInfo +include(baseprofiles/windows-x86_64-msvc2019_64) + [options] -qtbase:shared=yes qtbase:nomake=tests -qtbase:debug_and_release=yes -qtbase:force_debug_info=yes +qtbase:debug_and_release=True +qtbase:force_debug_info=True qtbase:zlib=None qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON" *:cmake_args_leaf_module="" diff --git a/coin/conan/profiles/windows-x86_64-msvc2019_64-developer b/coin/conan/profiles/windows-x86_64-msvc2019_64-developer new file mode 100644 index 00000000..39803809 --- /dev/null +++ b/coin/conan/profiles/windows-x86_64-msvc2019_64-developer @@ -0,0 +1,14 @@ +include(baseprofiles/windows-x86_64-msvc2019_64-developer) + +[options] +qtbase:nomake=tests +qtbase:debug_and_release=True +qtbase:force_debug_info=True +qtbase:developer_build=True +qtbase:headersclean=True +qtbase:make=examples +qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_system_zlib=OFF" +*:cmake_args_leaf_module="-DFEATURE_system_zlib=OFF" +[build_requires] +[env] +CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/platform_configs/cmake_platforms.yaml b/coin/platform_configs/cmake_platforms.yaml index 784e83cf..c53bc0a0 100644 --- a/coin/platform_configs/cmake_platforms.yaml +++ b/coin/platform_configs/cmake_platforms.yaml @@ -27,7 +27,7 @@ Configurations: Features: ['Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON' Environment variables: [ - 'CONAN_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc'] + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer'] - Template: 'qtci-linux-SLES-15_SP3-x86_64-51' Compiler: 'GCC' @@ -40,7 +40,7 @@ Configurations: Configure arguments: '-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DFEATURE_headersclean=ON -DQT_BUILD_EXAMPLES=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF -DPostgreSQL_ROOT={{.Env.POSTGRESQL_LIB_x64}}\..' Environment variables: [ 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_msvc}}', - 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64'] + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64'] - Template: 'qtci-windows-11_21H2-x86_64-51' Compiler: 'MSVC2019' @@ -72,8 +72,9 @@ Configurations: Id: 'Windows10_21H2-MSVC2019-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' - Features: ['Sccache', "DebugAndRelease"] + Features: ['Sccache', 'Conan', "DebugAndRelease"] Configure arguments: '-G"Ninja Multi-Config" -DQT_BUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_INCLUDE_x64}}\.. -DFEATURE_system_zlib=OFF' + Environment variables: ['CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer'] - Template: 'qtci-windows-10_21H2-x86_64-51' Compiler: 'MSVC2019' @@ -82,8 +83,8 @@ Configurations: Platform dependency: 'Windows10_21H2-MSVC2019-x64-host' Environment variables: [ 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ROOT_DIR_x64_arm64}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-msvc2019_64', - 'CONAN_PROFILE=coin/conan/profiles/windows-arm64-msvc2019_64', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64-developer', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64', 'OPENSSL_CONF_x64={{.Env.OPENSSL_CONF_x64_arm64}}', 'OPENSSL_INCLUDE_x64={{.Env.OPENSSL_INCLUDE_x64_arm64}}', 'OPENSSL_LIB_x64={{.Env.OPENSSL_LIB_x64_arm64}}'] @@ -105,7 +106,9 @@ Configurations: Environment variables: [ 'TARGET_CONFIGURE_ARGS={{.Env.TARGET_CONFIGURE_ARGS}} -DQT_QMAKE_TARGET_MKSPEC=win32-arm64-msvc -G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="RelWithDebInfo;Debug" -DFEATURE_msvc_obj_debug_info=ON -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', 'TEST_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', - 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache'] + 'NON_QTBASE_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-msvc2019_64', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-arm64-msvc2019_64'] - Id: 'RHEL-8.4-host' Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -113,7 +116,7 @@ Configurations: Features: ['Packaging', 'Sccache'] Configure arguments: '-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_headersclean=ON -DFEATURE_separate_debug_info=ON -DFEATURE_system_jpeg=OFF -DFEATURE_system_png=OFF -DFEATURE_system_pcre2=OFF -DFEATURE_system_harfbuzz=OFF -DFEATURE_system_doubleconversion=OFF -DFEATURE_libudev=OFF -DINPUT_bundled_xcb_xinput=yes -DOpenGL_GL_PREFERENCE=LEGACY' Environment variables: [ - 'CONAN_PROFILE=coin/conan/profiles/linux-x86_64-gcc'] + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc'] - Template: 'qtci-macos-11-x86_64-104' Target os: 'IOS_ANY' @@ -124,8 +127,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DebugAndRelease', 'DisableTests'] Environment variables: ['TARGET_CONFIGURE_ARGS=-G"Ninja Multi-Config" -DCMAKE_CONFIGURATION_TYPES="Release;Debug" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_SYSTEM_NAME=iOS', 'NON_QTBASE_TARGET_CONFIGURE_ARGS=', - 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/macos-ios-arm64-clang'] + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-macos-ios-arm64-clang'] - Id: 'Windows10_21H2-Mingw11-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' @@ -136,7 +139,7 @@ Configurations: 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_system_tiff=OFF', 'LLVM_INSTALL_DIR={{.Env.LLVM_INSTALL_DIR_mingw}}', - 'CONAN_PROFILE=coin/conan/profiles/windows-x86_64-mingw'] + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw'] - Id: 'Windows10_21H2-LLVM-x64-host' Template: 'qtci-windows-10_21H2-x86_64-51' diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml index 402cbfda..8efd491d 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml @@ -10,8 +10,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang' ] - Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -36,8 +36,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang' ] - Template: 'qtci-linux-RHEL-8.4-x86_64-50' @@ -49,6 +49,6 @@ Configurations: Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang' ] diff --git a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml index 4591b26c..96db0ce7 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_macos.yaml @@ -10,8 +10,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-arm64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-arm64-clang' ] - Template: 'qtci-macos-10.14-x86_64' @@ -23,8 +23,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-armv7-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-armv7-clang' ] - Template: 'qtci-macos-10.14-x86_64' @@ -36,8 +36,8 @@ Configurations: Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang' ] - Template: 'qtci-macos-10.14-x86_64' @@ -49,6 +49,6 @@ Configurations: Features: ['Packaging', 'Sccache', 'DisableTests'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/macos-universal-clang', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang' ] diff --git a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml index 05e28ac6..cbaa774c 100644 --- a/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml +++ b/coin/platform_configs/cmake_platforms_target_android_host_windows.yaml @@ -11,8 +11,8 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=arm64-v8a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-arm64-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-arm64-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -25,8 +25,8 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=armeabi-v7a -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-armv7-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-armv7-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -39,8 +39,8 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86-clang' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -53,6 +53,6 @@ Configurations: Environment variables: [ 'Path={{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86_64 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DFEATURE_pkg_config=OFF', - 'CONAN_HOST_PROFILE=coin/conan/profiles/windows-x86_64-mingw', - 'CONAN_PROFILE=coin/conan/profiles/windows-android-x86_64-clang'] + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-android-x86_64-clang'] diff --git a/coin/platform_configs/cmake_platforms_wasm.yaml b/coin/platform_configs/cmake_platforms_wasm.yaml index a161f706..1dbff8b4 100644 --- a/coin/platform_configs/cmake_platforms_wasm.yaml +++ b/coin/platform_configs/cmake_platforms_wasm.yaml @@ -9,6 +9,8 @@ Configurations: Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc-debug-developer', + 'CONAN_PROFILE=coin/conan/profiles/ci-linux-webassembly-x86_64-clang' ] - Template: 'qtci-windows-10_21H2-x86_64-51' @@ -21,7 +23,9 @@ Configurations: 'Path={{.Env.EMSDK_PATH}};{{.Env.MINGW1120}}\bin;{{.Env.Path}}', 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', - 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF'] + 'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DFEATURE_pkg_config=OFF', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-windows-x86_64-mingw', + 'CONAN_PROFILE=coin/conan/profiles/ci-windows-webassembly-x86_64-clang'] - Template: 'qtci-macos-10.14-x86_64' Target os: 'WebAssembly' @@ -32,6 +36,6 @@ Configurations: Environment variables: [ 'EM_CONFIG={{.Env.EMSDK}}/.emscripten', 'TARGET_CONFIGURE_ARGS=-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=Release', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-developer-x86_64-gcc', - 'CONAN_PROFILE=coin/conan/profiles/linux-webassembly-x86_64-gcc' + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-macos-universal-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-macos-webassembly-x86_64-clang' ] diff --git a/coin/platform_configs/macos.yaml b/coin/platform_configs/macos.yaml index 0638daca..19f8bbfb 100644 --- a/coin/platform_configs/macos.yaml +++ b/coin/platform_configs/macos.yaml @@ -16,7 +16,7 @@ Configurations: Configure arguments: '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_separate_debug_info=ON -DFEATURE_headersclean=ON -DFEATURE_framework=ON -DODBC_ROOT=/usr/local/opt/libiodbc -DPostgreSQL_ROOT={{.Env.POSTGRESQLBINPATH}}/.. -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_DIR}}' Environment variables: [ 'NON_QTBASE_CONFIGURE_ARGS=-DFEATURE_gds=OFF', - 'CONAN_PROFILE=coin/conan/profiles/macos-universal-clang' + 'CONAN_PROFILE=coin/conan/profiles/ci-macos-universal-clang' ] # Test on all supported macOS versions (deployment targets) diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 13b76470..8ff467c6 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -17,8 +17,7 @@ Configurations: Features: ['Packaging', 'Sccache', 'AndroidTestRun'] Environment variables: [ 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', 'CONAN_INSTALL_DIR={{.InstallDir}}/target', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang', 'ANDROID_EMULATOR=@emulator_x86_api_23'] - |