Use non-modular boost.
This commit is contained in:
parent
ce90eb08c8
commit
935644846b
|
@ -61,7 +61,7 @@ jobs:
|
||||||
|
|
||||||
- name: Conan install
|
- name: Conan install
|
||||||
run: |
|
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
|
shell: cmd
|
||||||
|
|
||||||
- name: Conan build
|
- name: Conan build
|
||||||
|
|
|
@ -48,6 +48,6 @@ else
|
||||||
> conan remote add --force bincrafters https://api.bintray.com/conan/bincrafters/public-conan
|
> conan remote add --force bincrafters https://api.bintray.com/conan/bincrafters/public-conan
|
||||||
|
|
||||||
# Initialize & run build
|
# 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
|
> conan build . -bf build
|
||||||
```
|
```
|
||||||
|
|
|
@ -9,7 +9,7 @@ from conans import ConanFile, CMake
|
||||||
class FBX2glTFConan(ConanFile):
|
class FBX2glTFConan(ConanFile):
|
||||||
settings = "os", "compiler", "build_type", "arch"
|
settings = "os", "compiler", "build_type", "arch"
|
||||||
requires = (
|
requires = (
|
||||||
("boost_filesystem/1.69.0@bincrafters/stable"),
|
("boost/1.76.0"),
|
||||||
("libiconv/1.15@bincrafters/stable"),
|
("libiconv/1.15@bincrafters/stable"),
|
||||||
("zlib/1.2.11@conan/stable"),
|
("zlib/1.2.11@conan/stable"),
|
||||||
("libxml2/2.9.9@bincrafters/stable"),
|
("libxml2/2.9.9@bincrafters/stable"),
|
||||||
|
|
Loading…
Reference in New Issue