fix_android_install_path.diff 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. diff --git a/lib_acl/CMakeLists.txt b/lib_acl/CMakeLists.txt
  2. index 287d5f3..d0c8241 100644
  3. --- a/lib_acl/CMakeLists.txt
  4. +++ b/lib_acl/CMakeLists.txt
  5. @@ -177,7 +177,7 @@ if (ACL_CLIENT_ONLY MATCHES "YES")
  6. endif()
  7. if (CMAKE_SYSTEM_NAME MATCHES "Android")
  8. - set(acl_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../android/lib/${ANDROID_ABI})
  9. + set(acl_output_path ${PROJECT_BINARY_DIR}/../lib)
  10. elseif (CMAKE_SYSTEM_NAME MATCHES "OHOS")
  11. set(acl_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../harmony/lib/${OHOS_ARCH})
  12. else()
  13. diff --git a/lib_acl_cpp/CMakeLists.txt b/lib_acl_cpp/CMakeLists.txt
  14. index 08c558e..afb3936 100644
  15. --- a/lib_acl_cpp/CMakeLists.txt
  16. +++ b/lib_acl_cpp/CMakeLists.txt
  17. @@ -252,7 +252,7 @@ elseif (${WIN_OS})
  18. endif()
  19. if (CMAKE_SYSTEM_NAME MATCHES "Android")
  20. - set(lib_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../android/lib/${ANDROID_ABI})
  21. + set(lib_output_path ${PROJECT_BINARY_DIR}/../lib)
  22. elseif (CMAKE_SYSTEM_NAME MATCHES "OHOS")
  23. set(lib_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../harmony/lib/${OHOS_ARCH})
  24. else()
  25. diff --git a/lib_fiber/c/CMakeLists.txt b/lib_fiber/c/CMakeLists.txt
  26. index c784212..d8931f6 100644
  27. --- a/lib_fiber/c/CMakeLists.txt
  28. +++ b/lib_fiber/c/CMakeLists.txt
  29. @@ -141,7 +141,7 @@ list(APPEND lib_src ${src}/fiber/boost/make_gas.S
  30. ${src}/fiber/boost/jump_gas.S)
  31. if (CMAKE_SYSTEM_NAME MATCHES "Android")
  32. - set(lib_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../../android/lib/${ANDROID_ABI})
  33. + set(lib_output_path ${PROJECT_BINARY_DIR}/../lib)
  34. else()
  35. set(lib_output_path ${PROJECT_BINARY_DIR}/../lib)
  36. endif()
  37. diff --git a/lib_fiber/cpp/CMakeLists.txt b/lib_fiber/cpp/CMakeLists.txt
  38. index 4d70233..1c41f9b 100644
  39. --- a/lib_fiber/cpp/CMakeLists.txt
  40. +++ b/lib_fiber/cpp/CMakeLists.txt
  41. @@ -130,7 +130,7 @@ foreach(iter ${sources})
  42. endforeach()
  43. if (CMAKE_SYSTEM_NAME MATCHES "Android")
  44. - set(lib_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../../android/lib/${ANDROID_ABI})
  45. + set(lib_output_path ${PROJECT_BINARY_DIR}/../lib)
  46. else()
  47. set(lib_output_path ${PROJECT_BINARY_DIR}/../lib)
  48. endif()
  49. diff --git a/lib_protocol/CMakeLists.txt b/lib_protocol/CMakeLists.txt
  50. index b53ee88..e047e59 100644
  51. --- a/lib_protocol/CMakeLists.txt
  52. +++ b/lib_protocol/CMakeLists.txt
  53. @@ -129,7 +129,7 @@ elseif (${WIN_OS})
  54. endif()
  55. if (CMAKE_SYSTEM_NAME MATCHES "Android")
  56. - set(lib_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../android/lib/${ANDROID_ABI})
  57. + set(lib_output_path ${PROJECT_BINARY_DIR}/../lib)
  58. elseif (CMAKE_SYSTEM_NAME MATCHES "OHOS")
  59. set(lib_output_path ${CMAKE_CURRENT_SOURCE_DIR}/../harmony/lib/${OHOS_ARCH})
  60. else()