From 7efe3a1655321eb14a4a3772165c006a4e7cba90 Mon Sep 17 00:00:00 2001 From: Par Winzell Date: Tue, 4 Dec 2018 09:54:08 -0800 Subject: [PATCH] Better iconv handling. Jeez, CMake... --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 590b7d3..8219ab4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_THREAD_PREFER_PTHREAD TRUE) find_package(Threads REQUIRED) find_package(LibXml2 REQUIRED) find_package(ZLIB REQUIRED) -find_package(iConv) +find_package(Iconv QUIET) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}") include(ExternalProject) @@ -229,7 +229,6 @@ if (NOT MSVC) endif() target_link_libraries(libFBX2glTF - Iconv::Iconv ${FRAMEWORKS} ${DRACO_LIB} ${FMT_LIB} @@ -258,6 +257,11 @@ target_include_directories(libFBX2glTF SYSTEM PUBLIC ${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 ${CXXOPTS_INCLUDE_DIR} )