debundle_iconv.diff 2.9 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. diff --git a/lib_acl_cpp/CMakeLists.txt b/lib_acl_cpp/CMakeLists.txt
  2. index 08aabee..b55c6dc 100644
  3. --- a/lib_acl_cpp/CMakeLists.txt
  4. +++ b/lib_acl_cpp/CMakeLists.txt
  5. @@ -263,7 +263,7 @@ set(LIBRARY_OUTPUT_PATH ${lib_output_path})
  6. set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${lib_output_path})
  7. add_library(acl_cpp_static STATIC ${lib_src})
  8. -target_link_libraries(acl_cpp_static ZLIB::ZLIB)
  9. +target_link_libraries(acl_cpp_static ZLIB::ZLIB Iconv::Iconv)
  10. if (${WIN_OS})
  11. set_target_properties(acl_cpp_static PROPERTIES
  12. @@ -309,7 +309,7 @@ if (ACL_BUILD_SHARED MATCHES "YES")
  13. target_compile_options(acl_cpp_static PRIVATE
  14. -fvisibility=hidden -fvisibility-inlines-hidden)
  15. elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
  16. - set(sys_ldflags "-shared -liconv -lpthread -ldl")
  17. + set(sys_ldflags "-shared -lpthread -ldl")
  18. target_compile_options(acl_cpp_static PRIVATE
  19. -fvisibility=hidden -fvisibility-inlines-hidden)
  20. set(CMAKE_MACOSX_RPATH 1)
  21. @@ -337,7 +337,7 @@ if (ACL_BUILD_SHARED MATCHES "YES")
  22. set(lc_flags "-Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib -L${lib_output_path}")
  23. set(CMAKE_SHARED_LINKER_FLAGS "${lc_flags} ${sys_ldflags}")
  24. set_target_properties(acl_cpp_shared PROPERTIES OUTPUT_NAME "acl_cpp")
  25. - target_link_libraries(acl_cpp_shared protocol acl ZLIB::ZLIB)
  26. + target_link_libraries(acl_cpp_shared protocol acl ZLIB::ZLIB Iconv::Iconv)
  27. endif()
  28. if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin|iOS|Android|FreeBSD")
  29. diff --git a/lib_fiber/cpp/CMakeLists.txt b/lib_fiber/cpp/CMakeLists.txt
  30. index 6b93850..2aa6804 100644
  31. --- a/lib_fiber/cpp/CMakeLists.txt
  32. +++ b/lib_fiber/cpp/CMakeLists.txt
  33. @@ -139,7 +139,7 @@ set(LIBRARY_OUTPUT_PATH ${lib_output_path})
  34. set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${lib_output_path})
  35. add_library(fiber_cpp_static STATIC ${lib_src})
  36. -target_link_libraries(fiber_cpp_static ZLIB::ZLIB)
  37. +target_link_libraries(fiber_cpp_static ZLIB::ZLIB Iconv::Iconv)
  38. if (${WIN_OS})
  39. set_target_properties(fiber_cpp_static PROPERTIES
  40. @@ -181,7 +181,7 @@ if (ACL_BUILD_SHARED MATCHES "YES")
  41. target_compile_options(fiber_cpp_static PRIVATE
  42. -fvisibility=hidden -fvisibility-inlines-hidden)
  43. elseif (CMAKE_SYSTEM_NAME MATCHES "Darwin")
  44. - set(sys_ldflags "-shared -liconv -lpthread -ldl")
  45. + set(sys_ldflags "-shared -lpthread -ldl")
  46. target_compile_options(fiber_cpp_static PRIVATE
  47. -fvisibility=hidden -fvisibility-inlines-hidden)
  48. set(CMAKE_MACOSX_RPATH 1)
  49. @@ -210,7 +210,7 @@ if (ACL_BUILD_SHARED MATCHES "YES")
  50. set_target_properties(fiber_cpp_shared PROPERTIES OUTPUT_NAME "fiber_cpp")
  51. set(lc_ldflags "-Wl,-rpath,${CMAKE_INSTALL_PREFIX}/lib -L${lib_output_path}")
  52. set(CMAKE_SHARED_LINKER_FLAGS "${lc_ldflags} ${sys_ldflags}")
  53. - target_link_libraries(fiber_cpp_shared acl_cpp protocol acl fiber ZLIB::ZLIB)
  54. + target_link_libraries(fiber_cpp_shared acl_cpp protocol acl fiber ZLIB::ZLIB Iconv::Iconv)
  55. endif()
  56. if(CMAKE_SYSTEM_NAME MATCHES "Linux|Darwin|iOS|Android|FreeBSD")