Ver Fonte

Better iconv handling. Jeez, CMake...

Par Winzell há 6 anos atrás
pai
commit
90e5bef116
1 ficheiros alterados com 6 adições e 2 exclusões
  1. 6 2
      CMakeLists.txt

+ 6 - 2
CMakeLists.txt

@@ -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}
 )
 )