From 935644846b7a92144f5e45748e3e31c0148b71ef Mon Sep 17 00:00:00 2001 From: "K. S. Ernest (iFire) Lee" Date: Sun, 6 Jun 2021 18:16:10 -0700 Subject: [PATCH] Use non-modular boost. --- .github/workflows/build-win-10.yml | 2 +- README.md | 2 +- conanfile.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-win-10.yml b/.github/workflows/build-win-10.yml index 0270dad..ceefd61 100644 --- a/.github/workflows/build-win-10.yml +++ b/.github/workflows/build-win-10.yml @@ -61,7 +61,7 @@ jobs: - name: Conan install run: | - conan install . -i build -s build_type=Release -s compiler="Visual Studio" --build fmt --build boost_system --build boost_filesystem --build libiconv --build=libxml2 --build=zlib + conan install . -i build -s build_type=Release -s compiler="Visual Studio" --build fmt --build libiconv --build=libxml2 --build=zlib --build=bzip2 --build=libbacktrace --build=boost shell: cmd - name: Conan build diff --git a/README.md b/README.md index 96d8e4c..aad4ca3 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,6 @@ else > conan remote add --force bincrafters https://api.bintray.com/conan/bincrafters/public-conan # Initialize & run build -> conan install . -i build -s build_type=Release ${CONAN_CONFIG} --build fmt --build boost_system --build boost_filesystem --build libiconv --build=libxml2 --build=zlib +> conan install . -i build -s build_type=Release ${CONAN_CONFIG} --build fmt --build libiconv --build=libxml2 --build=zlib --build=bzip2 --build=libbacktrace --build=boost > conan build . -bf build ``` diff --git a/conanfile.py b/conanfile.py index be675d0..294a162 100644 --- a/conanfile.py +++ b/conanfile.py @@ -9,7 +9,7 @@ from conans import ConanFile, CMake class FBX2glTFConan(ConanFile): settings = "os", "compiler", "build_type", "arch" requires = ( - ("boost_filesystem/1.69.0@bincrafters/stable"), + ("boost/1.76.0"), ("libiconv/1.15@bincrafters/stable"), ("zlib/1.2.11@conan/stable"), ("libxml2/2.9.9@bincrafters/stable"),