From 3fea4fc3c651bd939653de6feff9eff1c37efc04 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Mon, 4 Oct 2021 15:13:30 +0300 Subject: Conan: Scope qtbase related options to qtbase recipe only Some option names supported by qtbase Conan build recipe conflict with other Conan package recipes, e.g. ICU which also supports 'shared' option but with different supported option values. Scope all qtbase related options in profiles to qtbase only. Change-Id: I4c8bc2b7f5ee7cb69f3b83ef209ddda809719d73 Reviewed-by: Toni Saario --- coin/conan/profiles/linux-developer-x86_64-gcc | 10 ++++----- coin/conan/profiles/linux-webassembly-x86_64-gcc | 12 +++++------ coin/conan/profiles/linux-x86_64-gcc | 26 ++++++++++++------------ coin/conan/profiles/macos-ios-arm64-clang | 10 ++++----- coin/conan/profiles/macos-universal-clang | 16 +++++++-------- coin/conan/profiles/unix-android-arm64-clang | 20 +++++++++--------- coin/conan/profiles/unix-android-armv7-clang | 20 +++++++++--------- coin/conan/profiles/unix-android-x86-clang | 20 +++++++++--------- coin/conan/profiles/unix-android-x86_64-clang | 20 +++++++++--------- coin/conan/profiles/windows-android-arm64-clang | 22 ++++++++++---------- coin/conan/profiles/windows-android-armv7-clang | 22 ++++++++++---------- coin/conan/profiles/windows-android-x86-clang | 22 ++++++++++---------- coin/conan/profiles/windows-android-x86_64-clang | 22 ++++++++++---------- coin/conan/profiles/windows-arm64-msvc2019_64 | 10 ++++----- coin/conan/profiles/windows-x86_64-mingw | 20 +++++++++--------- coin/conan/profiles/windows-x86_64-msvc2019_64 | 16 +++++++-------- 16 files changed, 144 insertions(+), 144 deletions(-) diff --git a/coin/conan/profiles/linux-developer-x86_64-gcc b/coin/conan/profiles/linux-developer-x86_64-gcc index da5d0e21..3cf7b9fc 100644 --- a/coin/conan/profiles/linux-developer-x86_64-gcc +++ b/coin/conan/profiles/linux-developer-x86_64-gcc @@ -6,11 +6,11 @@ compiler.libcxx=libstdc++11 build_type=Release [options] -*:release=yes -*:shared=yes -*:nomake=tests;examples -*:developer_build=yes -*:cmake_args_qtbase="-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +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" [build_requires] [env] diff --git a/coin/conan/profiles/linux-webassembly-x86_64-gcc b/coin/conan/profiles/linux-webassembly-x86_64-gcc index 8fc5c575..f5120e9e 100644 --- a/coin/conan/profiles/linux-webassembly-x86_64-gcc +++ b/coin/conan/profiles/linux-webassembly-x86_64-gcc @@ -6,12 +6,12 @@ compiler.libcxx=libstdc++ build_type=Release [options] -*:release=yes -*:shared=no -*:qt_host_path=$QT_HOST_PATH -*:nomake=examples;tests -*:force_debug_info=yes -*:cmake_args_qtbase="-DQT_QMAKE_TARGET_MKSPEC=wasm-emscripten -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache" +qtbase:release=yes +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" [build_requires] [env] diff --git a/coin/conan/profiles/linux-x86_64-gcc b/coin/conan/profiles/linux-x86_64-gcc index 8ffc5e0e..12692b62 100644 --- a/coin/conan/profiles/linux-x86_64-gcc +++ b/coin/conan/profiles/linux-x86_64-gcc @@ -6,19 +6,19 @@ compiler.libcxx=libstdc++11 build_type=Release [options] -*:release=yes -*:shared=yes -*:nomake=tests;examples -*:separate_debug_info=yes -*:force_debug_info=yes -*:bundled_xcb_xinput=yes -*:headersclean=yes -*:libudev=no -*:doubleconversion=qt -*:pcre=qt -*:libjpeg=qt -*:libpng=qt -*: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" +qtbase:release=yes +qtbase:shared=yes +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" [build_requires] [env] diff --git a/coin/conan/profiles/macos-ios-arm64-clang b/coin/conan/profiles/macos-ios-arm64-clang index d22faa97..916a4a13 100644 --- a/coin/conan/profiles/macos-ios-arm64-clang +++ b/coin/conan/profiles/macos-ios-arm64-clang @@ -7,11 +7,11 @@ compiler.libcxx=libc++ build_type=Release [options] -*:shared=no -*:debug_and_release=yes -*:nomake=examples;tests -*:qt_host_path=$QT_HOST_PATH -*:cmake_args_qtbase="-DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_SYSTEM_NAME=iOS" +qtbase:shared=no +qtbase:debug_and_release=yes +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" [build_requires] [env] CONAN_CMAKE_GENERATOR=Ninja diff --git a/coin/conan/profiles/macos-universal-clang b/coin/conan/profiles/macos-universal-clang index c114a959..47d6c031 100644 --- a/coin/conan/profiles/macos-universal-clang +++ b/coin/conan/profiles/macos-universal-clang @@ -7,14 +7,14 @@ compiler.libcxx=libc++ build_type=Release [options] -*:release=yes -*:shared=yes -*:nomake=examples;tests -*:force_debug_info=yes -*:separate_debug_info=yes -*:headersclean=yes -*:framework=yes -*: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/..' +qtbase:release=yes +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" [build_requires] [env] diff --git a/coin/conan/profiles/unix-android-arm64-clang b/coin/conan/profiles/unix-android-arm64-clang index 74aff3b0..1d93d0de 100644 --- a/coin/conan/profiles/unix-android-arm64-clang +++ b/coin/conan/profiles/unix-android-arm64-clang @@ -7,16 +7,16 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=$QT_HOST_PATH -*:platform=android-clang -*:android_abis=arm64-v8a -*:android_ndk=$ANDROID_NDK_ROOT -*:android_sdk=$ANDROID_SDK_HOME -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=$QT_HOST_PATH +qtbase:platform=android-clang +qtbase:android_abis=arm64-v8a +qtbase:android_ndk=$ANDROID_NDK_ROOT +qtbase:android_sdk=$ANDROID_SDK_HOME +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" [build_requires] [env] diff --git a/coin/conan/profiles/unix-android-armv7-clang b/coin/conan/profiles/unix-android-armv7-clang index 85f13323..b576d91c 100644 --- a/coin/conan/profiles/unix-android-armv7-clang +++ b/coin/conan/profiles/unix-android-armv7-clang @@ -7,16 +7,16 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=$QT_HOST_PATH -*:platform=android-clang -*:android_abis=armeabi-v7a -*:android_ndk=$ANDROID_NDK_ROOT -*:android_sdk=$ANDROID_SDK_HOME -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=$QT_HOST_PATH +qtbase:platform=android-clang +qtbase:android_abis=armeabi-v7a +qtbase:android_ndk=$ANDROID_NDK_ROOT +qtbase:android_sdk=$ANDROID_SDK_HOME +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" [build_requires] [env] diff --git a/coin/conan/profiles/unix-android-x86-clang b/coin/conan/profiles/unix-android-x86-clang index 55d85c98..415902b9 100644 --- a/coin/conan/profiles/unix-android-x86-clang +++ b/coin/conan/profiles/unix-android-x86-clang @@ -7,16 +7,16 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=$QT_HOST_PATH -*:platform=android-clang -*:android_abis=x86 -*:android_ndk=$ANDROID_NDK_ROOT -*:android_sdk=$ANDROID_SDK_HOME -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=$QT_HOST_PATH +qtbase:platform=android-clang +qtbase:android_abis=x86 +qtbase:android_ndk=$ANDROID_NDK_ROOT +qtbase:android_sdk=$ANDROID_SDK_HOME +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" [build_requires] [env] diff --git a/coin/conan/profiles/unix-android-x86_64-clang b/coin/conan/profiles/unix-android-x86_64-clang index 6bc1153b..81dab910 100644 --- a/coin/conan/profiles/unix-android-x86_64-clang +++ b/coin/conan/profiles/unix-android-x86_64-clang @@ -7,16 +7,16 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=$QT_HOST_PATH -*:platform=android-clang -*:android_abis=x86_64 -*:android_ndk=$ANDROID_NDK_ROOT -*:android_sdk=$ANDROID_SDK_HOME -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=$QT_HOST_PATH +qtbase:platform=android-clang +qtbase:android_abis=x86_64 +qtbase:android_ndk=$ANDROID_NDK_ROOT +qtbase:android_sdk=$ANDROID_SDK_HOME +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" [build_requires] [env] diff --git a/coin/conan/profiles/windows-android-arm64-clang b/coin/conan/profiles/windows-android-arm64-clang index a3f10242..e9bd7a64 100644 --- a/coin/conan/profiles/windows-android-arm64-clang +++ b/coin/conan/profiles/windows-android-arm64-clang @@ -7,17 +7,17 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:pkg_config=no -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=%QT_HOST_PATH% -*:platform=android-clang -*:android_abis=arm64-v8a -*:android_ndk=%ANDROID_NDK_ROOT% -*:android_sdk=%ANDROID_SDK_HOME% -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:pkg_config=no +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=%QT_HOST_PATH% +qtbase:platform=android-clang +qtbase:android_abis=arm64-v8a +qtbase:android_ndk=%ANDROID_NDK_ROOT% +qtbase:android_sdk=%ANDROID_SDK_HOME% +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" [build_requires] [env] diff --git a/coin/conan/profiles/windows-android-armv7-clang b/coin/conan/profiles/windows-android-armv7-clang index d9374bc1..c6480857 100644 --- a/coin/conan/profiles/windows-android-armv7-clang +++ b/coin/conan/profiles/windows-android-armv7-clang @@ -7,17 +7,17 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:pkg_config=no -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=%QT_HOST_PATH% -*:platform=android-clang -*:android_abis=armeabi-v7a -*:android_ndk=%ANDROID_NDK_ROOT% -*:android_sdk=%ANDROID_SDK_HOME% -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:pkg_config=no +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=%QT_HOST_PATH% +qtbase:platform=android-clang +qtbase:android_abis=armeabi-v7a +qtbase:android_ndk=%ANDROID_NDK_ROOT% +qtbase:android_sdk=%ANDROID_SDK_HOME% +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" [build_requires] [env] diff --git a/coin/conan/profiles/windows-android-x86-clang b/coin/conan/profiles/windows-android-x86-clang index ccb4f4f7..9dd6c9ee 100644 --- a/coin/conan/profiles/windows-android-x86-clang +++ b/coin/conan/profiles/windows-android-x86-clang @@ -7,17 +7,17 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:pkg_config=no -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=%QT_HOST_PATH% -*:platform=android-clang -*:android_abis=x86 -*:android_ndk=%ANDROID_NDK_ROOT% -*:android_sdk=%ANDROID_SDK_HOME% -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:pkg_config=no +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=%QT_HOST_PATH% +qtbase:platform=android-clang +qtbase:android_abis=x86 +qtbase:android_ndk=%ANDROID_NDK_ROOT% +qtbase:android_sdk=%ANDROID_SDK_HOME% +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" [build_requires] [env] diff --git a/coin/conan/profiles/windows-android-x86_64-clang b/coin/conan/profiles/windows-android-x86_64-clang index 23d6ed30..f5ef8541 100644 --- a/coin/conan/profiles/windows-android-x86_64-clang +++ b/coin/conan/profiles/windows-android-x86_64-clang @@ -7,17 +7,17 @@ compiler.libcxx=c++_shared build_type=Release [options] -*:release=yes -*:shared=yes -*:pkg_config=no -*:force_debug_info=yes -*:nomake=examples;tests -*:qt_host_path=%QT_HOST_PATH% -*:platform=android-clang -*:android_abis=x86_64 -*:android_ndk=%ANDROID_NDK_ROOT% -*:android_sdk=%ANDROID_SDK_HOME% -*: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" +qtbase:release=yes +qtbase:shared=yes +qtbase:pkg_config=no +qtbase:force_debug_info=yes +qtbase:nomake=examples;tests +qtbase:qt_host_path=%QT_HOST_PATH% +qtbase:platform=android-clang +qtbase:android_abis=x86_64 +qtbase:android_ndk=%ANDROID_NDK_ROOT% +qtbase:android_sdk=%ANDROID_SDK_HOME% +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" [build_requires] [env] diff --git a/coin/conan/profiles/windows-arm64-msvc2019_64 b/coin/conan/profiles/windows-arm64-msvc2019_64 index 81b7b388..cf799fc8 100644 --- a/coin/conan/profiles/windows-arm64-msvc2019_64 +++ b/coin/conan/profiles/windows-arm64-msvc2019_64 @@ -8,11 +8,11 @@ compiler.runtime_type=Release build_type=Release [options] -*:release=yes -*:shared=yes -*:qt_host_path=$QT_HOST_PATH -*:nomake=tests -*: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" +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" [build_requires] [env] diff --git a/coin/conan/profiles/windows-x86_64-mingw b/coin/conan/profiles/windows-x86_64-mingw index 039d43be..2740ae9e 100644 --- a/coin/conan/profiles/windows-x86_64-mingw +++ b/coin/conan/profiles/windows-x86_64-mingw @@ -6,16 +6,16 @@ compiler.libcxx=libstdc++ build_type=Release [options] -*:release=yes -*:shared=yes -*:debug_and_release=yes -*:force_debug_info=yes -*:separate_debug_info=yes -*:nomake=examples;tests -*:zlib=qt -*:libjpeg=qt -*:freetype=qt -*: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%\.." +qtbase:release=yes +qtbase:shared=yes +qtbase:debug_and_release=yes +qtbase:force_debug_info=yes +qtbase:separate_debug_info=yes +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" [build_requires] [env] diff --git a/coin/conan/profiles/windows-x86_64-msvc2019_64 b/coin/conan/profiles/windows-x86_64-msvc2019_64 index a241ad9d..b24160ce 100644 --- a/coin/conan/profiles/windows-x86_64-msvc2019_64 +++ b/coin/conan/profiles/windows-x86_64-msvc2019_64 @@ -8,14 +8,14 @@ compiler.runtime_type=Release build_type=Release [options] -*:release=yes -*:shared=yes -*:nomake=tests -*:debug_and_release=yes -*:force_debug_info=yes -*:headersclean=yes -*:zlib=None -*: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" +qtbase:release=yes +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" [build_requires] [env] -- cgit v1.2.3