diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 339867a..735544f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -54,14 +54,9 @@ jobs: zstd -d -r --rm ./sdk || true shell: bash - - name: Add conan remote - run: | - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan - shell: cmd - - name: Conan install 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 - name: Conan build @@ -143,14 +138,9 @@ jobs: zstd -d -r --rm ./sdk || true shell: bash - - name: Add conan remote - run: | - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan - shell: bash - - name: Conan install 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 - name: Conan build @@ -236,14 +226,9 @@ jobs: zstd -d -r --rm ./sdk || true shell: bash - - name: Add conan remote - run: | - conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan - shell: bash - - name: Conan install 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 - name: Conan build diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a7ece6..1984bf6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,9 +46,9 @@ list(INSERT CMAKE_MODULE_PATH 0 "${CMAKE_BINARY_DIR}") # stuff we get from Conan find_package(Boost 1.76 COMPONENTS system filesystem program_options REQUIRED ) -find_package(LibXml2 MODULE REQUIRED) find_package(ZLIB MODULE REQUIRED) find_package(fmt MODULE REQUIRED) +find_package(Iconv MODULE REQUIRED) # create a compilation database for e.g. clang-tidy set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -212,15 +212,12 @@ target_link_libraries(libFBX2glTF optimized ${FBXSDK_LIBRARY} debug ${FBXSDK_LIBRARY_DEBUG} fmt::fmt - xml2::xml2 ZLIB::ZLIB + Iconv::Iconv ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ) -find_package(Iconv REQUIRED) -target_link_libraries(${PROJECT_NAME} PRIVATE Iconv::Iconv) - target_include_directories(libFBX2glTF PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src )