diff --git a/config/conan.conf b/config/conan.conf index 739c3f5..173f291 100644 --- a/config/conan.conf +++ b/config/conan.conf @@ -1,2 +1,4 @@ [general] revisions_enabled = 1 # enable revisions +tools.system.package_manager:mode = install +tools.system.package_manager:sudo = True diff --git a/global.conf b/global.conf new file mode 100644 index 0000000..3e1b4f6 --- /dev/null +++ b/global.conf @@ -0,0 +1,2 @@ +tools.system.package_manager:mode = install +tools.system.package_manager:sudo = True diff --git a/profiles/linux_x86_64_gcc12_shared b/profiles/linux_x86_64_gcc12_shared deleted file mode 100644 index 73da1e6..0000000 --- a/profiles/linux_x86_64_gcc12_shared +++ /dev/null @@ -1,76 +0,0 @@ -include(base_profiles/linux_base) -include(options/linux_options) - -[settings] -arch=x86_64 -compiler=gcc -compiler.version=12 -compiler.libcxx=libstdc++11 - -[buildenv] -CC=x86_64-linux-gnu-gcc-12 -CXX=x86_64-linux-gnu-g++-12 - -[options] -abseil/*:shared=True -brotli/*:shared=True -bzip2/*:shared=True -catch2/*:shared=True -cpuinfo/*:shared=True -dav1d/*:shared=True -double-conversion/*:shared=True -expat/*:shared=True -ffmpeg/*:shared=True -flac/*:shared=True -fontconfig/*:shared=True -freetype/*:shared=True -glib/*:shared=True -harfbuzz/*:shared=True -icu/*:shared=True -jbig/*:shared=True -libalsa/*:shared=True -libaom-av1/*:shared=True -libelf/*:shared=True -libcap/*:shared=True -libdeflate/*:shared=True -libfdk_aac/*:shared=True -libffi/*:shared=True -libiconv/*:shared=True -libjpeg-turbo/*:shared=True -libmount/*:shared=True -libmp3lame/*:shared=True -libpng/*:shared=True -libpq/*:shared=True -libselinux/*:shared=True -libsndfile/*:shared=True -libsodium/*:shared=True -libsvtav1/*:shared=True -libtiff/*:shared=True -libvpx/*:shared=True -libwebp/*:shared=True -libxml2/*:shared=True -libx264/*:shared=True -libx265/*:shared=True -libyuv/*:shared=True -md4c/*:shared=True -odbc/*:shared=True -ogg/*:shared=True -openal-soft/*:shared=True -openh264/*:shared=True -openjpeg/*:shared=True -openssl/*:shared=True -opus/*:shared=True -pcre2/*:shared=True -pulseaudio/*:shared=True -pulseaudio/*:with_glib=True -qt/*:shared=True -sqlite3/*:shared=True -vaapi/*:shared=True -vdpau/*:shared=True -vorbis/*:shared=True -vulkan-loader/*:shared=True -xkbcommon/*:shared=True -xorg/*:shared=True -xz_utils/*:shared=True -zlib/*:shared=True -zstd/*:shared=True diff --git a/profiles/options/linux_options b/profiles/options/linux_options index 580252a..aa382ac 100644 --- a/profiles/options/linux_options +++ b/profiles/options/linux_options @@ -1,9 +1,12 @@ include(base_options.jinja) [options] +ffmpeg/*:with_programs=False jbig/*:build_executables=False libtiff/*:jpeg=libjpeg-turbo libyuv/*:with_jpeg=libjpeg-turbo pulseaudio/*:with_glib=True +qt/*:shared=True +qt/*:with_dbus=True qt/*:with_glib=True qt/*:with_harfbuzz=True qt/*:with_libalsa=True @@ -15,7 +18,7 @@ qt/*:qtconnectivity=True qt/*:qtdeclarative=True qt/*:qtgraphicaleffects=True qt/*:qtimageformats=True -qt/*:qtlocation=True +qt/*:qtlocation=False qt/*:qtlottie=True qt/*:qtmultimedia=True qt/*:qtqa=True @@ -34,6 +37,7 @@ qt/*:qtcharts=True qt/*:qtvirtualkeyboard=True qt/*:qtremoteobject=True qt/*:qtscxml=True +qt/*:qtsensors=True qt/*:qtspeech=True qt/*:qtnetworkauth=True qt/*:qtmacextras=False diff --git a/profiles/options/windows_options b/profiles/options/windows_options index 090780b..f6940b1 100644 --- a/profiles/options/windows_options +++ b/profiles/options/windows_options @@ -1,10 +1,12 @@ include(base_options.jinja) [options] +ffmpeg/*:with_programs=False jbig/*:build_executables=False libtiff/*:jpeg=libjpeg-turbo libyuv/*:with_jpeg=libjpeg-turbo -qt/*:cross_compile="x86_64-w64-mingw32.static-" +qt/*:cross_compile="x86_64-w64-mingw32.shared-" qt/*:opengl=desktop +qt/*:shared=True qt/*:with_harfbuzz=True qt/*:with_mysql=False qt/*:with_openal=False @@ -14,7 +16,7 @@ qt/*:qtconnectivity=True qt/*:qtdeclarative=True qt/*:qtgraphicaleffects=True qt/*:qtimageformats=True -qt/*:qtlocation=True +qt/*:qtlocation=False qt/*:qtlottie=True qt/*:qtmultimedia=True qt/*:qtqa=True @@ -33,6 +35,7 @@ qt/*:qtcharts=True qt/*:qtvirtualkeyboard=True qt/*:qtremoteobject=True qt/*:qtscxml=True +qt/*:qtsensors=True qt/*:qtspeech=True qt/*:qtnetworkauth=True qt/*:qtwinextras=True diff --git a/profiles/windows_x86_64_gcc11_mxe_static b/profiles/windows_x86_64_gcc11_mxe similarity index 51% rename from profiles/windows_x86_64_gcc11_mxe_static rename to profiles/windows_x86_64_gcc11_mxe index 1a15fbe..4321e11 100644 --- a/profiles/windows_x86_64_gcc11_mxe_static +++ b/profiles/windows_x86_64_gcc11_mxe @@ -9,11 +9,11 @@ compiler.libcxx=libstdc++11 compiler.cppstd=17 [buildenv] -CC=/mxe/usr/bin/x86_64-w64-mingw32.static-gcc -AR=/mxe/usr/bin/x86_64-w64-mingw32.static-ar -RANLIB=/mxe/usr/bin/x86_64-w64-mingw32.static-ranlib -RC=/mxe/usr/bin/x86_64-w64-mingw32.static-windres -WINDRES=/mxe/usr/bin/x86_64-w64-mingw32.static-windres +CC=/mxe/usr/bin/x86_64-w64-mingw32.shared-gcc +AR=/mxe/usr/bin/x86_64-w64-mingw32.shared-ar +RANLIB=/mxe/usr/bin/x86_64-w64-mingw32.shared-ranlib +RC=/mxe/usr/bin/x86_64-w64-mingw32.shared-windres +WINDRES=/mxe/usr/bin/x86_64-w64-mingw32.shared-windres LIBTOOL=/mxe/usr/bin/x86_64-pc-linux-gnu/installed/libtool -CXX=/mxe/usr/bin/x86_64-w64-mingw32.static-g++ +CXX=/mxe/usr/bin/x86_64-w64-mingw32.shared-g++ PATH=/mxe/usr/bin:${PATH}:/mxe/usr/x86_64-pc-linux-gnu/bin/:mxe/usr/x86_64-pc-linux-gnu/installed diff --git a/profiles/windows_x86_64_gcc11_mxe_shared b/profiles/windows_x86_64_gcc11_mxe_shared deleted file mode 100644 index 7be527d..0000000 --- a/profiles/windows_x86_64_gcc11_mxe_shared +++ /dev/null @@ -1,61 +0,0 @@ -include(windows_x86_64_gcc11) -[buildenv] -CC=/mxe/usr/bin/x86_64-w64-mingw32.shared-gcc -AR=/mxe/usr/bin/x86_64-w64-mingw32.shared-ar -RANLIB=/mxe/usr/bin/x86_64-w64-mingw32.shared-ranlib -RC=/mxe/usr/bin/x86_64-w64-mingw32.shared-windres -WINDRES=/mxe/usr/bin/x86_64-w64-mingw32.shared-windres -DLLTOOL=/mxe/usr/bin/x86_64-w64-mingw32.shared-dlltool -LIBTOOL=/mxe/usr/bin/x86_64-pc-linux-gnu/installed/libtool -CXX=/mxe/usr/bin/x86_64-w64-mingw32.shared-g++ -PREFIX=/mxe/usr/bin/x86_64-w64-mingw32.shared- -DLLTOOL=/mxe/usr/bin/x86_64-w64-mingw32.shared-dlltool -PATH=${PATH}:/mxe/usr/bin/:/mxe/usr/x86_64-pc-linux-gnu/bin/:mxe/usr/x86_64-pc-linux-gnu/installed -CMAKE_C_COMPILER=/mxe/usr/x86_64-pc-linux-gnu/bin/cmake -[options] -abseil/*:shared=True -brotli/*:shared=True -bzip2/*:shared=True -catch2/*:shared=True -cpuinfo/*:shared=True -dav1d/*:shared=True -double-conversion/*:shared=True -expat/*:shared=True -ffmpeg/*:shared=True -freetype/*:shared=True -glib/*:shared=True -harfbuzz/*:shared=True -jbig/*:shared=True -libaom-av1/*:shared=True -libdeflate/*:shared=True -libelf/*:shared=True -libfdk_aac/*:shared=True -libffi/*:shared=True -libgettext/*:shared=True -libiconv/*:shared=True -libjpeg-turbo/*:shared=True -libmount/*:shared=True -libmp3lame/*:shared=True -libpng/*:shared=True -libpq/*:shared=True -libsvtav1/*:shared=True -libtiff/*:shared=True -libwebp/*:shared=True -libx264/*:shared=True -libx265/*:shared=True -libyuv/*:shared=True -md4c/*:shared=True -ogg/*:shared=True -openal-soft/*:shared=True -openh264/*:shared=True -openjpeg/*:shared=True -openssl/*:shared=True -opus/*:shared=True -pcre2/*:shared=True -qt/*:cross_compile="x86_64-w64-mingw32.shared-" -qt/*:shared=True -sqlite3/*:shared=True -vorbis/*:shared=True -xz_utils/*:shared=True -zlib/*:shared=True -zstd/*:shared=True