diff --git a/CMakeLists.txt b/CMakeLists.txt index ef805d6..1bd82d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,6 @@ include("${CMAKE_BINARY_DIR}/conan_paths.cmake") set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) -find_package(Iconv QUIET) # stuff we get from Conan find_package(boost_filesystem REQUIRED) @@ -49,6 +48,7 @@ find_package(boost_optional REQUIRED) find_package(libxml2 REQUIRED) find_package(zlib REQUIRED) find_package(fmt REQUIRED) +find_package(libiconv REQUIRED) # create a compilation database for e.g. clang-tidy set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -202,12 +202,13 @@ target_link_libraries(libFBX2glTF ${FRAMEWORKS} boost_filesystem::boost_filesystem boost_optional::boost_optional - fmt::fmt - libxml2::libxml2 - zlib::zlib ${DRACO_LIB} optimized ${FBXSDK_LIBRARY} debug ${FBXSDK_LIBRARY_DEBUG} + fmt::fmt + libxml2::libxml2 + zlib::zlib + libiconv::libiconv ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ) @@ -219,6 +220,7 @@ target_include_directories(libFBX2glTF PUBLIC fmt::fmt libxml2::libxml2 zlib::zlib + libiconv::libiconv ) target_include_directories(libFBX2glTF SYSTEM PUBLIC @@ -231,11 +233,6 @@ target_include_directories(libFBX2glTF SYSTEM PUBLIC ${CPPCODEC_INCLUDE_DIR} ) -if (Iconv_FOUND) - target_link_libraries(libFBX2glTF Iconv::Iconv) - target_include_directories(libFBX2glTF SYSTEM PUBLIC Iconv::Iconv) -endif() - target_include_directories(appFBX2glTF PUBLIC "third_party/CLI11" ) diff --git a/appveyor.yml b/appveyor.yml index 04b4c00..4ae70e7 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,8 +9,9 @@ environment: stack: python %PYTHON% -cache: - - C:\Users\appveyor\.conan\data -> appveyor.yml, conanfile.py +#temporarily disabled +#cache: +# - C:\Users\appveyor\.conan\data -> appveyor.yml, conanfile.py init: - git config --global filter.lfs.required false diff --git a/conanfile.py b/conanfile.py index 8f5292b..be675d0 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,6 +10,7 @@ class FBX2glTFConan(ConanFile): settings = "os", "compiler", "build_type", "arch" requires = ( ("boost_filesystem/1.69.0@bincrafters/stable"), + ("libiconv/1.15@bincrafters/stable"), ("zlib/1.2.11@conan/stable"), ("libxml2/2.9.9@bincrafters/stable"), ("fmt/5.3.0@bincrafters/stable"),