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

Better iconv handling. Jeez, CMake...

This commit is contained in:
Par Winzell 2018-12-04 09:54:08 -08:00
parent 3e0aa3565c
commit 90e5bef116
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -13,7 +13,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(LibXml2 REQUIRED) find_package(LibXml2 REQUIRED)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
find_package(iConv) find_package(Iconv QUIET)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}")
include(ExternalProject) include(ExternalProject)
@ -229,7 +229,6 @@ if (NOT MSVC)
endif() endif()
target_link_libraries(libFBX2glTF target_link_libraries(libFBX2glTF
Iconv::Iconv
${FRAMEWORKS} ${FRAMEWORKS}
${DRACO_LIB} ${DRACO_LIB}
${FMT_LIB} ${FMT_LIB}
@ -258,6 +257,11 @@ target_include_directories(libFBX2glTF SYSTEM PUBLIC
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )
if (Iconv::Iconv)
target_link_libraries(libFBX2glTF Iconv::Iconv)
target_include_directories(libFBX2glTF SYSTEM PUBLIC Iconv::Iconv)
endif()
target_include_directories(appFBX2glTF PUBLIC target_include_directories(appFBX2glTF PUBLIC
${CXXOPTS_INCLUDE_DIR} ${CXXOPTS_INCLUDE_DIR}
) )