dqn
/
FBX2glTF
mirror of https://github.com/facebookincubator/FBX2glTF.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Work on Windows 11.

This commit is contained in:
K. S. Ernest (iFire) Lee 2021-11-17 08:35:34 -08:00
parent e71e42a7e7
commit 608956f103
2 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
.github/workflows/build.yml vendored
View File

@ -54,14 +54,9 @@ jobs:
zstd -d -r --rm ./sdk || true zstd -d -r --rm ./sdk || true
shell: bash shell: bash
- name: Add conan remote
run: |
conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
shell: cmd
- name: Conan install - name: Conan install
run: | run: |
conan install . -i build -s build_type=Release -s compiler="Visual Studio" --build fmt --build libiconv --build=libxml2 --build=zlib --build=bzip conan install . -i build -s build_type=Release -s compiler="Visual Studio"
shell: cmd shell: cmd
- name: Conan build - name: Conan build
@ -143,14 +138,9 @@ jobs:
zstd -d -r --rm ./sdk || true zstd -d -r --rm ./sdk || true
shell: bash shell: bash
- name: Add conan remote
run: |
conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
shell: bash
- name: Conan install - name: Conan install
run: | run: |
conan install . -i build -s build_type=Release --build fmt -s compiler.libcxx=libstdc++11 --build libiconv --build=libxml2 --build=zlib --build=bzip conan install . -i build -s build_type=Release --build fmt -s compiler.libcxx=libstdc++11
shell: bash shell: bash
- name: Conan build - name: Conan build
@ -236,14 +226,9 @@ jobs:
zstd -d -r --rm ./sdk || true zstd -d -r --rm ./sdk || true
shell: bash shell: bash
- name: Add conan remote
run: |
conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
shell: bash
- name: Conan install - name: Conan install
run: | run: |
conan install . -i build -s build_type=Release --build fmt --build libiconv --build=libxml2 --build=zlib --build=bzip conan install . -i build -s build_type=Release
shell: bash shell: bash
- name: Conan build - name: Conan build

7
CMakeLists.txt
View File

@ -46,9 +46,9 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_BINARY_DIR}")
# stuff we get from Conan # stuff we get from Conan
find_package(Boost 1.76 COMPONENTS system filesystem program_options REQUIRED ) find_package(Boost 1.76 COMPONENTS system filesystem program_options REQUIRED )
find_package(LibXml2 MODULE REQUIRED)
find_package(ZLIB MODULE REQUIRED) find_package(ZLIB MODULE REQUIRED)
find_package(fmt MODULE REQUIRED) find_package(fmt MODULE REQUIRED)
find_package(Iconv MODULE REQUIRED)
# create a compilation database for e.g. clang-tidy # create a compilation database for e.g. clang-tidy
set(CMAKE_EXPORT_COMPILE_COMMANDS ON) set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@ -212,15 +212,12 @@ target_link_libraries(libFBX2glTF
optimized ${FBXSDK_LIBRARY} optimized ${FBXSDK_LIBRARY}
debug ${FBXSDK_LIBRARY_DEBUG} debug ${FBXSDK_LIBRARY_DEBUG}
fmt::fmt fmt::fmt
xml2::xml2
ZLIB::ZLIB ZLIB::ZLIB
Iconv::Iconv
${CMAKE_DL_LIBS} ${CMAKE_DL_LIBS}
${CMAKE_THREAD_LIBS_INIT} ${CMAKE_THREAD_LIBS_INIT}
) )
find_package(Iconv REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv)
target_include_directories(libFBX2glTF PUBLIC target_include_directories(libFBX2glTF PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/src
) )