From d6fcea563f4bc32ed15fc045231dc005163c3d01 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Tue, 26 Oct 2021 14:51:47 +0300 Subject: [PATCH] Conan: Provide separate build profiles for end users and CI The CI uses e.g. "sccache" which is rarely used outside CI systems. Also openssl install directories in the build profiles are specific to CI build agents. Also headersclean option should be CI specific. Split the current profiles in two: the CI specific profile defines only the CI related details and includes the matching profile for the end users. The profile which includes other profile(s) will override the Settings or Options if redefined. Pick-to: 6.2 Task-number: QTQAINFRA-4619 Change-Id: If69e8c0c283655475671fcb0ca739087cd9d2567 Reviewed-by: Kai Koehne --- coin/conan/profiles/ci-linux-developer-x86_64-gcc | 5 +++++ coin/conan/profiles/ci-linux-webassembly-x86_64-gcc | 5 +++++ coin/conan/profiles/ci-linux-x86_64-gcc | 6 ++++++ coin/conan/profiles/ci-macos-ios-arm64-clang | 1 + coin/conan/profiles/ci-macos-universal-clang | 6 ++++++ coin/conan/profiles/ci-unix-android-arm64-clang | 5 +++++ coin/conan/profiles/ci-unix-android-armv7-clang | 5 +++++ coin/conan/profiles/ci-unix-android-x86-clang | 5 +++++ coin/conan/profiles/ci-unix-android-x86_64-clang | 5 +++++ coin/conan/profiles/ci-windows-android-arm64-clang | 5 +++++ coin/conan/profiles/ci-windows-android-armv7-clang | 5 +++++ coin/conan/profiles/ci-windows-android-x86-clang | 5 +++++ coin/conan/profiles/ci-windows-android-x86_64-clang | 5 +++++ coin/conan/profiles/ci-windows-arm64-msvc2019_64 | 4 ++++ coin/conan/profiles/ci-windows-x86_64-mingw | 6 ++++++ coin/conan/profiles/ci-windows-x86_64-msvc2019_64 | 7 +++++++ coin/conan/profiles/linux-developer-x86_64-gcc | 4 ++-- coin/conan/profiles/linux-webassembly-x86_64-gcc | 4 ++-- coin/conan/profiles/linux-x86_64-gcc | 5 ++--- coin/conan/profiles/macos-ios-arm64-clang | 1 - coin/conan/profiles/macos-universal-clang | 6 ++---- coin/conan/profiles/unix-android-arm64-clang | 5 ++--- coin/conan/profiles/unix-android-armv7-clang | 5 ++--- coin/conan/profiles/unix-android-x86-clang | 5 ++--- coin/conan/profiles/unix-android-x86_64-clang | 5 ++--- coin/conan/profiles/windows-android-arm64-clang | 5 ++--- coin/conan/profiles/windows-android-armv7-clang | 5 ++--- coin/conan/profiles/windows-android-x86-clang | 5 ++--- coin/conan/profiles/windows-android-x86_64-clang | 5 ++--- coin/conan/profiles/windows-arm64-msvc2019_64 | 5 ++--- coin/conan/profiles/windows-x86_64-mingw | 4 ++-- coin/conan/profiles/windows-x86_64-msvc2019_64 | 5 ++--- 32 files changed, 110 insertions(+), 44 deletions(-) create mode 100644 coin/conan/profiles/ci-linux-developer-x86_64-gcc create mode 100644 coin/conan/profiles/ci-linux-webassembly-x86_64-gcc create mode 100644 coin/conan/profiles/ci-linux-x86_64-gcc create mode 100644 coin/conan/profiles/ci-macos-ios-arm64-clang create mode 100644 coin/conan/profiles/ci-macos-universal-clang create mode 100644 coin/conan/profiles/ci-unix-android-arm64-clang create mode 100644 coin/conan/profiles/ci-unix-android-armv7-clang create mode 100644 coin/conan/profiles/ci-unix-android-x86-clang create mode 100644 coin/conan/profiles/ci-unix-android-x86_64-clang create mode 100644 coin/conan/profiles/ci-windows-android-arm64-clang create mode 100644 coin/conan/profiles/ci-windows-android-armv7-clang create mode 100644 coin/conan/profiles/ci-windows-android-x86-clang create mode 100644 coin/conan/profiles/ci-windows-android-x86_64-clang create mode 100644 coin/conan/profiles/ci-windows-arm64-msvc2019_64 create mode 100644 coin/conan/profiles/ci-windows-x86_64-mingw create mode 100644 coin/conan/profiles/ci-windows-x86_64-msvc2019_64 diff --git a/coin/conan/profiles/ci-linux-developer-x86_64-gcc b/coin/conan/profiles/ci-linux-developer-x86_64-gcc new file mode 100644 index 00000000..da331152 --- /dev/null +++ b/coin/conan/profiles/ci-linux-developer-x86_64-gcc @@ -0,0 +1,5 @@ +include(linux-developer-x86_64-gcc) + +[options] +qtbase:cmake_args_qtbase="-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-webassembly-x86_64-gcc b/coin/conan/profiles/ci-linux-webassembly-x86_64-gcc new file mode 100644 index 00000000..07554e39 --- /dev/null +++ b/coin/conan/profiles/ci-linux-webassembly-x86_64-gcc @@ -0,0 +1,5 @@ +include(linux-webassembly-x86_64-gcc) + +[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-linux-x86_64-gcc b/coin/conan/profiles/ci-linux-x86_64-gcc new file mode 100644 index 00000000..a7214f59 --- /dev/null +++ b/coin/conan/profiles/ci-linux-x86_64-gcc @@ -0,0 +1,6 @@ +include(linux-x86_64-gcc) + +[options] +qtbase:headersclean=yes +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-macos-ios-arm64-clang b/coin/conan/profiles/ci-macos-ios-arm64-clang new file mode 100644 index 00000000..b5238b98 --- /dev/null +++ b/coin/conan/profiles/ci-macos-ios-arm64-clang @@ -0,0 +1 @@ +include(macos-ios-arm64-clang) diff --git a/coin/conan/profiles/ci-macos-universal-clang b/coin/conan/profiles/ci-macos-universal-clang new file mode 100644 index 00000000..7ca313cb --- /dev/null +++ b/coin/conan/profiles/ci-macos-universal-clang @@ -0,0 +1,6 @@ +include(macos-universal-clang) + +[options] +qtbase:headersclean=yes +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-unix-android-arm64-clang b/coin/conan/profiles/ci-unix-android-arm64-clang new file mode 100644 index 00000000..7dbd4c10 --- /dev/null +++ b/coin/conan/profiles/ci-unix-android-arm64-clang @@ -0,0 +1,5 @@ +include(unix-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..f37a5616 --- /dev/null +++ b/coin/conan/profiles/ci-unix-android-armv7-clang @@ -0,0 +1,5 @@ +include(unix-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..1dfa600a --- /dev/null +++ b/coin/conan/profiles/ci-unix-android-x86-clang @@ -0,0 +1,5 @@ +include(unix-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..f5ec0daa --- /dev/null +++ b/coin/conan/profiles/ci-unix-android-x86_64-clang @@ -0,0 +1,5 @@ +include(unix-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..dab1e537 --- /dev/null +++ b/coin/conan/profiles/ci-windows-android-arm64-clang @@ -0,0 +1,5 @@ +include(windows-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..ddeab0a4 --- /dev/null +++ b/coin/conan/profiles/ci-windows-android-armv7-clang @@ -0,0 +1,5 @@ +include(windows-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..165b0ae1 --- /dev/null +++ b/coin/conan/profiles/ci-windows-android-x86-clang @@ -0,0 +1,5 @@ +include(windows-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..12819b00 --- /dev/null +++ b/coin/conan/profiles/ci-windows-android-x86_64-clang @@ -0,0 +1,5 @@ +include(windows-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" +*:cmake_args_leaf_module="-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 new file mode 100644 index 00000000..66290766 --- /dev/null +++ b/coin/conan/profiles/ci-windows-arm64-msvc2019_64 @@ -0,0 +1,4 @@ +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-x86_64-mingw b/coin/conan/profiles/ci-windows-x86_64-mingw new file mode 100644 index 00000000..a36bbd35 --- /dev/null +++ b/coin/conan/profiles/ci-windows-x86_64-mingw @@ -0,0 +1,6 @@ +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%\.." +*:cmake_args_leaf_module="-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" + diff --git a/coin/conan/profiles/ci-windows-x86_64-msvc2019_64 b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64 new file mode 100644 index 00000000..2bf31be0 --- /dev/null +++ b/coin/conan/profiles/ci-windows-x86_64-msvc2019_64 @@ -0,0 +1,7 @@ +include(windows-x86_64-msvc2019_64) + +[options] +qtbase:headersclean=yes +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/linux-developer-x86_64-gcc b/coin/conan/profiles/linux-developer-x86_64-gcc index 3cf7b9fc..c954db8e 100644 --- a/coin/conan/profiles/linux-developer-x86_64-gcc +++ b/coin/conan/profiles/linux-developer-x86_64-gcc @@ -10,8 +10,8 @@ qtbase:release=yes qtbase:shared=yes qtbase:nomake=tests;examples qtbase:developer_build=yes -qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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-gcc index ee05a48b..79d830a0 100644 --- a/coin/conan/profiles/linux-webassembly-x86_64-gcc +++ b/coin/conan/profiles/linux-webassembly-x86_64-gcc @@ -11,8 +11,8 @@ qtbase:shared=no 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 -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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/linux-x86_64-gcc b/coin/conan/profiles/linux-x86_64-gcc index d94ac71e..4ed89008 100644 --- a/coin/conan/profiles/linux-x86_64-gcc +++ b/coin/conan/profiles/linux-x86_64-gcc @@ -12,14 +12,13 @@ qtbase:nomake=tests;examples qtbase:separate_debug_info=yes qtbase:force_debug_info=yes qtbase:bundled_xcb_xinput=yes -qtbase:headersclean=yes qtbase:libudev=no qtbase:doubleconversion=qt qtbase:pcre=qt qtbase:libjpeg=qt qtbase:libpng=qt -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" +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] [env] CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/conan/profiles/macos-ios-arm64-clang b/coin/conan/profiles/macos-ios-arm64-clang index 916a4a13..aeda7ad4 100644 --- a/coin/conan/profiles/macos-ios-arm64-clang +++ b/coin/conan/profiles/macos-ios-arm64-clang @@ -15,4 +15,3 @@ qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/macos-universal-clang b/coin/conan/profiles/macos-universal-clang index 0a154683..2bc69dce 100644 --- a/coin/conan/profiles/macos-universal-clang +++ b/coin/conan/profiles/macos-universal-clang @@ -12,11 +12,9 @@ qtbase:shared=yes qtbase:nomake=examples;tests qtbase:force_debug_info=yes qtbase:separate_debug_info=yes -qtbase:headersclean=yes qtbase:framework=yes -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" +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] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/unix-android-arm64-clang b/coin/conan/profiles/unix-android-arm64-clang index 89c88de9..31142b6d 100644 --- a/coin/conan/profiles/unix-android-arm64-clang +++ b/coin/conan/profiles/unix-android-arm64-clang @@ -16,9 +16,8 @@ qtbase:platform=android-clang qtbase:android_abis=arm64-v8a qtbase:android_ndk=$ANDROID_NDK_ROOT qtbase:android_sdk=$ANDROID_SDK_ROOT -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/unix-android-armv7-clang b/coin/conan/profiles/unix-android-armv7-clang index 8feb5d42..aae295cd 100644 --- a/coin/conan/profiles/unix-android-armv7-clang +++ b/coin/conan/profiles/unix-android-armv7-clang @@ -16,9 +16,8 @@ qtbase:platform=android-clang qtbase:android_abis=armeabi-v7a qtbase:android_ndk=$ANDROID_NDK_ROOT qtbase:android_sdk=$ANDROID_SDK_ROOT -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/unix-android-x86-clang b/coin/conan/profiles/unix-android-x86-clang index 74dc477d..a6a51ca1 100644 --- a/coin/conan/profiles/unix-android-x86-clang +++ b/coin/conan/profiles/unix-android-x86-clang @@ -16,9 +16,8 @@ qtbase:platform=android-clang qtbase:android_abis=x86 qtbase:android_ndk=$ANDROID_NDK_ROOT qtbase:android_sdk=$ANDROID_SDK_ROOT -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/unix-android-x86_64-clang b/coin/conan/profiles/unix-android-x86_64-clang index fd31c742..0bb58769 100644 --- a/coin/conan/profiles/unix-android-x86_64-clang +++ b/coin/conan/profiles/unix-android-x86_64-clang @@ -16,9 +16,8 @@ qtbase:platform=android-clang qtbase:android_abis=x86_64 qtbase:android_ndk=$ANDROID_NDK_ROOT qtbase:android_sdk=$ANDROID_SDK_ROOT -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/windows-android-arm64-clang b/coin/conan/profiles/windows-android-arm64-clang index 20abef1e..85f9d3e5 100644 --- a/coin/conan/profiles/windows-android-arm64-clang +++ b/coin/conan/profiles/windows-android-arm64-clang @@ -17,9 +17,8 @@ qtbase:platform=android-clang qtbase:android_abis=arm64-v8a qtbase:android_ndk=%ANDROID_NDK_ROOT% qtbase:android_sdk=%ANDROID_SDK_ROOT% -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/windows-android-armv7-clang b/coin/conan/profiles/windows-android-armv7-clang index b3dcb397..fae7624f 100644 --- a/coin/conan/profiles/windows-android-armv7-clang +++ b/coin/conan/profiles/windows-android-armv7-clang @@ -17,9 +17,8 @@ qtbase:platform=android-clang qtbase:android_abis=armeabi-v7a qtbase:android_ndk=%ANDROID_NDK_ROOT% qtbase:android_sdk=%ANDROID_SDK_ROOT% -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/windows-android-x86-clang b/coin/conan/profiles/windows-android-x86-clang index 0c9ea29a..e812a80a 100644 --- a/coin/conan/profiles/windows-android-x86-clang +++ b/coin/conan/profiles/windows-android-x86-clang @@ -17,9 +17,8 @@ qtbase:platform=android-clang qtbase:android_abis=x86 qtbase:android_ndk=%ANDROID_NDK_ROOT% qtbase:android_sdk=%ANDROID_SDK_ROOT% -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DCMAKE_TOOLCHAIN_FILE=%ANDROID_NDK_ROOT%/build/cmake/android.toolchain.cmake -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/windows-android-x86_64-clang b/coin/conan/profiles/windows-android-x86_64-clang index 766da776..0b99efcc 100644 --- a/coin/conan/profiles/windows-android-x86_64-clang +++ b/coin/conan/profiles/windows-android-x86_64-clang @@ -17,9 +17,8 @@ qtbase:platform=android-clang qtbase:android_abis=x86_64 qtbase:android_ndk=%ANDROID_NDK_ROOT% qtbase:android_sdk=%ANDROID_SDK_ROOT% -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" -*:cmake_args_leaf_module="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja - diff --git a/coin/conan/profiles/windows-arm64-msvc2019_64 b/coin/conan/profiles/windows-arm64-msvc2019_64 index cf799fc8..f7f23eb1 100644 --- a/coin/conan/profiles/windows-arm64-msvc2019_64 +++ b/coin/conan/profiles/windows-arm64-msvc2019_64 @@ -12,9 +12,8 @@ qtbase:release=yes qtbase:shared=yes 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 -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" +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" +*:cmake_args_leaf_module="" [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 484107ed..2c0acd87 100644 --- a/coin/conan/profiles/windows-x86_64-mingw +++ b/coin/conan/profiles/windows-x86_64-mingw @@ -14,8 +14,8 @@ qtbase:nomake=examples;tests qtbase:zlib=qt qtbase:libjpeg=qt qtbase:freetype=qt -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%\.." -*:cmake_args_leaf_module="-DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ -DFEATURE_system_tiff=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++" +*:cmake_args_leaf_module="-DFEATURE_system_tiff=OFF" [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 d0ec091e..fde7d75a 100644 --- a/coin/conan/profiles/windows-x86_64-msvc2019_64 +++ b/coin/conan/profiles/windows-x86_64-msvc2019_64 @@ -12,10 +12,9 @@ qtbase:shared=yes qtbase:nomake=tests qtbase:debug_and_release=yes qtbase:force_debug_info=yes -qtbase:headersclean=yes qtbase:zlib=None -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" +qtbase:cmake_args_qtbase="-DCMAKE_C_COMPILER=cl.exe -DCMAKE_CXX_COMPILER=cl.exe -DFEATURE_msvc_obj_debug_info=ON" +*:cmake_args_leaf_module="" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja