diff --git a/.gitignore b/.gitignore index 0eb17e6c405618fa1ba917343e780b9ffea224f9..0069d4f8bd248ac6423bd52923ecbb83c1234897 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,10 @@ build/ out/ install/x86_64 +install/x86_32 install/arm_64 +install/arm_32 +install/system CMakeFiles/ .cmake/ arm-build-debug/ diff --git a/CMakeLists.txt b/CMakeLists.txt index 57114c9981318dc8cf2b7a6130984d35a0556be5..6b527f6d9a2a6fa0958bcd910efb62a9c9e12c3e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,7 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/bin DESTINATION ${INSTALL_PACK # 安装TpWM的system文件 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/system/ DESTINATION ${INSTALL_SYSTEM_DIR}) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/system/ DESTINATION ${INSTALL_PACKAGE_ROOT_PATH}/../system) # 修改bin下文件权限 install(CODE " diff --git a/TpExtUtils/CMakeLists.txt b/TpExtUtils/CMakeLists.txt index b7be2372f25cc59457737bd4930b40298515b4f3..73926c7573e4874b6e6df15a6fce2f9ca154900c 100644 --- a/TpExtUtils/CMakeLists.txt +++ b/TpExtUtils/CMakeLists.txt @@ -193,9 +193,10 @@ set(TPARCHIVE_LIB_STATIC_LIB ${DEPEND_STATIC_LIB_PATH}/libtparchive.a) # 将pthread库链接到可执行目标 target_link_libraries(TpExtUtils ${PCAP_LIB_STATIC_LIB} ${TPARCHIVE_LIB_STATIC_LIB} dl - pthread TpWMEngine TpUtils ssl json-c glib-2.0 + pthread TpUtils ssl json-c glib-2.0 gio-2.0 asound avcodec avfilter avformat avutil - swresample SDL2 avdevice swscale bluetooth dbus-1 usb-1.0 udev) + swresample SDL2 avdevice swscale bluetooth dbus-1 usb-1.0 udev + ${DEPEND_DYNAMIC_LIB_PATH}/libTpWMEngine.so) # 如果你需要将动态库安装到特定的目录,可以修改DESTINATION路径 install(TARGETS TpExtUtils LIBRARY DESTINATION ${INSTALL_LIB_DIR})