Skip to content

Commit 70136c6

Browse files
authored
Fix iconv on mac (facebookincubator#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.
1 parent ec98db9 commit 70136c6

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

CMakeLists.txt

+8-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ find_package(boost_optional MODULE REQUIRED)
5050
find_package(libxml2 MODULE REQUIRED)
5151
find_package(zlib MODULE REQUIRED)
5252
find_package(fmt MODULE REQUIRED)
53-
find_package(libiconv MODULE REQUIRED)
5453

5554
# create a compilation database for e.g. clang-tidy
5655
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
@@ -210,11 +209,18 @@ target_link_libraries(libFBX2glTF
210209
fmt::fmt
211210
libxml2::libxml2
212211
zlib::zlib
213-
libiconv::libiconv
214212
${CMAKE_DL_LIBS}
215213
${CMAKE_THREAD_LIBS_INIT}
216214
)
217215

216+
if (APPLE)
217+
find_package(Iconv MODULE REQUIRED)
218+
target_link_libraries(libFBX2glTF Iconv)
219+
else()
220+
find_package(libiconv MODULE REQUIRED)
221+
target_link_libraries(libFBX2glTF libiconv::libiconv)
222+
endif()
223+
218224
target_include_directories(libFBX2glTF PUBLIC
219225
${CMAKE_CURRENT_SOURCE_DIR}/src
220226
)

0 commit comments

Comments
 (0)