Z991239-1233 #comment other: 安装时进行第三方依赖库拷贝

Other/CMakeLists.txt

@@ -8,11 +8,11 @@ add_subdirectory(libscreencodec)
 add_subdirectory(libbizchan)
 
 if(MSVC)
-   #add_subdirectory(libimgplayer)
-   #add_subdirectory(libwmpplayer)
+   add_subdirectory(libimgplayer)
+   add_subdirectory(libwmpplayer)
 else(MSVC)
-   #add_subdirectory(libpictureplayer)
-   #add_subdirectory(libmediaplayer)
+   add_subdirectory(libpictureplayer)
+   add_subdirectory(libmediaplayer)
 endif(MSVC)
 
 # rvc_add_all_cmake_subdirectory()

Other/libimgplayer/CMakeLists.txt

@@ -43,3 +43,10 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
     COMPONENT libraries)
 endif(MSVC)
+
+# 设置要依赖拷贝的第三方库
+if(MSVC)
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
+else()
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+ENDIF(MSVC)

Other/libmediaplayer/CMakeLists.txt

@@ -83,3 +83,10 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
     COMPONENT libraries)
 endif(MSVC)
+
+# 设置要依赖拷贝的第三方库
+if(MSVC)
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
+else()
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+ENDIF(MSVC)

Other/libpictureplayer/CMakeLists.txt

@@ -61,3 +61,11 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
     COMPONENT libraries)
 endif(MSVC)
+
+
+# 设置要依赖拷贝的第三方库
+if(MSVC)
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
+else()
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+ENDIF(MSVC)

Other/libwmpplayer/CMakeLists.txt

@@ -100,3 +100,11 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
     COMPONENT libraries)
 endif(MSVC)
+
+
+# 设置要依赖拷贝的第三方库
+if(MSVC)
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_BIN_DIRS} PARENT_SCOPE)
+else()
+set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
+ENDIF(MSVC)