fix conan x86 build

.github/workflows/ci.yml

@@ -253,7 +253,7 @@ jobs:
       - name: Install dependencies with conan
         if: matrix.preset == 'conan_x86'
         shell: cmd
-        run: conan install . -of build -s build_type=Release -o *:shared=False --build=missing
+        run: conan install . -of build -s build_type=Release s:h arch=x86 -o *:shared=False --build=missing
 
       - name: Configure
         shell: cmd

CMakePresets.json

@@ -33,6 +33,7 @@
     {
       "name": "conan_x86",
       "binaryDir": "${sourceDir}/build",
+      "architecture": "WIN32",
       "cacheVariables": {
         "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/build/conan_toolchain.cmake",
         "CMAKE_POLICY_DEFAULT_CMP0091": "NEW",

README.md

@@ -41,6 +41,8 @@ cmake --build build
 ```
 
 ## Windows
+
+### x64
 Using vcpkg
 ```
 cmake --preset vcpkg
@@ -54,6 +56,22 @@ cmake --preset conan
 cmake --build build --config Release
 ```
 
+### x86
+Only Qt5 is tested on x86.
+
+Using vcpkg
+```
+cmake --preset vcpkg_x86
+cmake --build build --config Release
+```
+
+Using conan v2
+```
+conan install . -of build -s build_type=Release -s:h arch=x86 -o *:shared=False --build=missing
+cmake --preset conan_x86
+cmake --build build --config Release
+```
+
 If you don't use a package manager you will have to add library and include directories to your PATH or specify them with `CMAKE_PREFIX_PATH`.
 Qt is not installed as a dependency of either vcpkg or conan.
 

conanfile.py

@@ -1,10 +1,16 @@
 from conan import ConanFile
+from conan.tools.cmake import CMakeToolchain
 
 class Quazip(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    generators = "CMakeDeps", "CMakeToolchain"
+    generators = "CMakeDeps"
 
     requires = (
         "zlib/1.3.1",
         "bzip2/1.0.8"
-    )
+    )
+
+    def generate(self):
+        tc = CMakeToolchain(self)
+        tc.user_presets_path = False
+        tc.generate()