From 70136c6f5382ed48e60b29b870e010c6ba7dc14d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A4r=20Winzell?= Date: Tue, 11 Jun 2019 22:42:31 -0700 Subject: [PATCH] Fix iconv on mac (#208) The FBX SDK is compiled against a regular libiconv on Windows on Linux (with symbols libconv_open() etc) but on Mac, they compiled it against Apple's modified libiconv, which renames those functions. Annoyingly this means we need to explicitly decline the Conan libiconv package, for that platform only. --- CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a71e0d5..8bf5a09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -50,7 +50,6 @@ find_package(boost_optional MODULE REQUIRED) find_package(libxml2 MODULE REQUIRED) find_package(zlib MODULE REQUIRED) find_package(fmt MODULE REQUIRED) -find_package(libiconv MODULE REQUIRED) # create a compilation database for e.g. clang-tidy set(CMAKE_EXPORT_COMPILE_COMMANDS ON) @@ -210,11 +209,18 @@ target_link_libraries(libFBX2glTF fmt::fmt libxml2::libxml2 zlib::zlib - libiconv::libiconv ${CMAKE_DL_LIBS} ${CMAKE_THREAD_LIBS_INIT} ) +if (APPLE) + find_package(Iconv MODULE REQUIRED) + target_link_libraries(libFBX2glTF Iconv) +else() + find_package(libiconv MODULE REQUIRED) + target_link_libraries(libFBX2glTF libiconv::libiconv) +endif() + target_include_directories(libFBX2glTF PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/src )