浏览代码

#IQRV #comment PDB打包阶段1

80374374 1 年之前
父节点
当前提交
5a7dd25c6d
共有 44 个文件被更改,包括 130 次插入402 次删除
  1. 30 13
      CMakeLists.txt
  2. 2 2
      Framework/RVCComm/CMakeLists.txt
  3. 2 2
      Framework/RvcLogSdk/CMakeLists.txt
  4. 4 0
      Framework/RvcRestfulSdk/CMakeLists.txt
  5. 2 2
      Framework/libtoolkit/CMakeLists.txt
  6. 2 3
      Framework/spbase/CMakeLists.txt
  7. 2 2
      Framework/sphost/CMakeLists.txt
  8. 2 2
      Framework/spshell/CMakeLists.txt
  9. 2 2
      Framework/winpr/libwinpr/CMakeLists.txt
  10. 2 2
      Framework/winpr/tools/CMakeLists.txt
  11. 2 2
      Framework/winpr/tools/hash-cli/CMakeLists.txt
  12. 2 2
      Framework/winpr/tools/makecert-cli/CMakeLists.txt
  13. 2 3
      Module/CMakeLists.txt
  14. 25 0
      Other/CMakeLists.txt
  15. 1 15
      Other/acmstrdec/CMakeLists.txt
  16. 1 15
      Other/acmstrenc/CMakeLists.txt
  17. 1 15
      Other/libCMBPrint/CMakeLists.txt
  18. 1 14
      Other/libRestfulFunc/CMakeLists.txt
  19. 1 15
      Other/libaudiomgr/CMakeLists.txt
  20. 1 15
      Other/libfilecryption/CMakeLists.txt
  21. 1 15
      Other/liblog4rvcother/CMakeLists.txt
  22. 5 0
      Other/liblog4vendor/CMakeLists.txt
  23. 1 15
      Other/libpublicFun/CMakeLists.txt
  24. 1 17
      Other/libscreencodec/CMakeLists.txt
  25. 1 14
      Other/win/libaudions/CMakeLists.txt
  26. 1 15
      Other/win/libaudioqueue/CMakeLists.txt
  27. 1 15
      Other/win/libaudiorender/CMakeLists.txt
  28. 1 15
      Other/win/libbizchan/CMakeLists.txt
  29. 1 15
      Other/win/libfacecapture/CMakeLists.txt
  30. 1 15
      Other/win/libimgplayer/CMakeLists.txt
  31. 1 17
      Other/win/libmediaplayer/CMakeLists.txt
  32. 1 16
      Other/win/libpictureplayer/CMakeLists.txt
  33. 1 15
      Other/win/libsharememory/CMakeLists.txt
  34. 1 15
      Other/win/libvideohorflip/CMakeLists.txt
  35. 1 15
      Other/win/libvideoqueue/CMakeLists.txt
  36. 1 15
      Other/win/libvideorecord/CMakeLists.txt
  37. 1 15
      Other/win/libvideorender/CMakeLists.txt
  38. 1 15
      Other/win/libwmpplayer/CMakeLists.txt
  39. 1 15
      Other/win/showdev/CMakeLists.txt
  40. 4 0
      Tool/GuardianBase/CMakeLists.txt
  41. 5 0
      Tool/VTMLauncher/CMakeLists.txt
  42. 4 0
      Tool/guardian/CMakeLists.txt
  43. 4 0
      Tool/sprestart/CMakeLists.txt
  44. 3 2
      addin/cmake/ConfigOptions.cmake

+ 30 - 13
CMakeLists.txt

@@ -455,6 +455,7 @@ set(RVC_BASE_PATH "${PACK_INSTALL_PREFIX_VERSION}")
 set(RVC_INCLUDE_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/include")
 set(RVC_LIBRARY_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
 set(RVC_RUNTIME_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/bin")
+set(RVC_PDBSAVE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/pdb")
 set(RVC_PLUGINS_PATH "${RVC_RUNTIME_PATH}/plugins")
 set(RVC_MODULE_PATH  "${PACK_INSTALL_PREFIX_CUR_VER}/mod")
 set(RVC_CONFIG_PATH    "${PACK_INSTALL_PREFIX_CUR_VER}/cfg")
@@ -463,7 +464,6 @@ set(RVC_SHARED_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/share")
 set(RVC_RESOURCE_PATH   "${PACK_INSTALL_PREFIX_CUR_VER}/res")
 #win
 set(RVC_CHROMIUM_PATH "${RVC_RUNTIME_PATH}/Chromium")
-
 set(CMAKE_INSTALL_INCLUDEDIR ${RVC_INCLUDE_PATH})
 set(CMAKE_INSTALL_BINDIR ${RVC_RUNTIME_PATH})
 if(MSVC)
@@ -504,15 +504,20 @@ if(WIN32)
 endif(WIN32)
 
 if(MSVC)
-  # Force to always compile with W4
-  if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
-    string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-  else()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
-  endif()
+	# Force to always compile with W4
+	if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
+	string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+	else()
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
+	endif()
+
+	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+	set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
+	set(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG /OPT:REF /OPT:ICF")
+
 elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  # Update if necessary
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
+	# Update if necessary
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
 endif()
 message(STATUS "definition content: CMAKE_C_FLAGS:${CMAKE_C_FLAGS}; CMAKE_CXX_FLAGS:${CMAKE_CXX_FLAGS}")
 # Include files
@@ -568,11 +573,13 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.in" ${CMAKE_BINARY_DIR}/Ch
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+#Output directory for MS debug symbol .pdb files generated by the linker for executable and shared library targets.
+#This variable is used to initialize the PDB_OUTPUT_DIRECTORY property on all the targets. See that target property for additional information.
+set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/pdb)
 if(WIN32)
-	set(RVC_PDB_BINARY_DIR "${CMAKE_BINARY_DIR}/bin/${CMAKE_CONFIGURATION_TYPES}")
+	set(RVC_PDB_BINARY_DIR "${CMAKE_PDB_OUTPUT_DIRECTORY}/${CMAKE_CONFIGURATION_TYPES}")
 else()
-	set(RVC_PDB_BINARY_DIR ${CMAKE_BINARY_DIR}/bin)
+	set(RVC_PDB_BINARY_DIR ${CMAKE_PDB_OUTPUT_DIRECTORY})
 endif(WIN32)
 message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
 
@@ -699,7 +706,6 @@ if(DEVOPS_ON)
 	endif(DEVOPS_ON_CMAKE_PRD)
 endif(DEVOPS_ON)
 
-
 if(MSVC)
 	configure_file("${CMAKE_SOURCE_DIR}/addin/packaging/WIN/installbat.in" "${CMAKE_BINARY_DIR}/install.bat" @ONLY NEWLINE_STYLE CRLF)
 	install(PROGRAMS "${CMAKE_BINARY_DIR}/install.bat" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
@@ -826,6 +832,17 @@ if(CONAN_RES_DIRS_VENDORFILE)
 	install(DIRECTORY "${CONAN_RES_DIRS_VENDORFILE}" DESTINATION "${PACK_INSTALL_MISCS_DIR}" COMPONENT resources)
 endif(CONAN_RES_DIRS_VENDORFILE)
 
+#pdb save
+if(WITH_PDB_SAVEV2)
+	message(STATUS "config pdb save scripts.")
+	string(TIMESTAMP PDBSAVE_TIME %Y%m%d_%H%M%S)
+	set(PDB_ZIP_FILE_NAME "savepdbVS2019_${RVC_VERSION}_${PDBSAVE_TIME}.7z")
+	install(CODE "MESSAGE(\"----Pack PDB file ${PDB_ZIP_FILE_NAME}----\")" COMPONENT symbols)
+	install(CODE "execute_process(COMMAND 7z a ${PDB_ZIP_FILE_NAME} ${RVC_PDB_BINARY_DIR}/* WORKING_DIRECTORY ${CMAKE_BINARY_DIR})" COMPONENT symbols)
+	install(CODE "execute_process(COMMAND curl -T ${PDB_ZIP_FILE_NAME} ftp://99.12.43.134:3721 -u savefile:12345678 WORKING_DIRECTORY ${CMAKE_BINARY_DIR})" COMPONENT symbols)
+	install(CODE "MESSAGE(\"----Pack PDB File Done----\")" COMPONENT symbols)
+endif(WITH_PDB_SAVEV2)
+
 #appoint the component to install , except header file here.
  #set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE TRUE)

+ 2 - 2
Framework/RVCComm/CMakeLists.txt

@@ -91,8 +91,8 @@ else()
 		COMPONENT libraries)
 endif(MSVC)
 
-if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()
 
 if(MSVC)

+ 2 - 2
Framework/RvcLogSdk/CMakeLists.txt

@@ -67,8 +67,8 @@ install(TARGETS ${MODULE_NAME}
 	COMPONENT libraries)
 endif(MSVC)
 
-if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()
 
 if(MSVC)

+ 4 - 0
Framework/RvcRestfulSdk/CMakeLists.txt

@@ -44,6 +44,10 @@ install(TARGETS ${MODULE_NAME}
     COMPONENT libraries)
 endif(MSVC)
 
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
+endif()
+
 if(BUILD_TESTING)
     add_subdirectory(test)
 endif(BUILD_TESTING)

+ 2 - 2
Framework/libtoolkit/CMakeLists.txt

@@ -101,8 +101,8 @@ else()
     COMPONENT libraries)
 endif(MSVC)
 
-if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()
 
 if(INSTALL_DEVELOP_FILES)

+ 2 - 3
Framework/spbase/CMakeLists.txt

@@ -115,7 +115,6 @@ install(TARGETS ${MODULE_NAME}
     COMPONENT libraries)
 endif(MSVC)
 
-if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb 
-        DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()

+ 2 - 2
Framework/sphost/CMakeLists.txt

@@ -37,6 +37,6 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
     )
 
-if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()

+ 2 - 2
Framework/spshell/CMakeLists.txt

@@ -135,8 +135,8 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
     )
 
-if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()
 
 #不再在bin目录下附带QT相关的内容

+ 2 - 2
Framework/winpr/libwinpr/CMakeLists.txt

@@ -160,8 +160,8 @@ install(TARGETS ${MODULE_NAME}
 	COMPONENT libraries)
 endif(MSVC)
 
-if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
-    install(FILES ${RVC_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/libwinpr")

+ 2 - 2
Framework/winpr/tools/CMakeLists.txt

@@ -118,9 +118,9 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
     COMPONENT libraries)
 
-if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
     get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
-    install(FILES ${CMAKE_PDB_OUTPUT_DIRECTORY}/${OUTPUT_FILENAME}.pdb DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT symbols)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
 

+ 2 - 2
Framework/winpr/tools/hash-cli/CMakeLists.txt

@@ -45,8 +45,8 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets)
 
-if (WITH_DEBUG_SYMBOLS AND MSVC)
-	install(FILES ${CMAKE_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC)
+	install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")

+ 2 - 2
Framework/winpr/tools/makecert-cli/CMakeLists.txt

@@ -47,6 +47,6 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS} winpr)
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools")
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT tools EXPORT WinPRTargets)
-if (WITH_DEBUG_SYMBOLS AND MSVC)
-    install(FILES ${CMAKE_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+if (WITH_PDB_SAVE AND MSVC)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
 endif()

+ 2 - 3
Module/CMakeLists.txt

@@ -110,9 +110,8 @@ macro(deploy_module _module_prefix _module_name)
         COMPONENT modules)
     endif(MSVC)
 
-    if (WITH_DEBUG_SYMBOLS AND MSVC AND BUILD_SHARED_LIBS)
-        install(FILES ${RVC_PDB_BINARY_DIR}/${_module_name}.pdb 
-        DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT symbols)
+    if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+        install(FILES ${RVC_PDB_BINARY_DIR}/${_module_name}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
     endif()
 
     set_property(TARGET ${_module_name} PROPERTY FOLDER "module/")

+ 25 - 0
Other/CMakeLists.txt

@@ -1,3 +1,28 @@
+
+macro(deploy_others _module_prefix _module_name)
+
+    if(MSVC)
+	    install(TARGETS ${_module_name} 
+		    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
+		    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
+		    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
+        )
+    else(MSVC)
+	    install(TARGETS ${_module_name} 
+		    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
+		    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
+		    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
+		    COMPONENT libraries)
+    endif(MSVC)
+
+    if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+        install(FILES ${RVC_PDB_BINARY_DIR}/${_module_name}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
+    endif()
+
+    set_property(TARGET ${_module_name} PROPERTY FOLDER "other/")
+
+endmacro(deploy_others)
+
 add_subdirectory(libpublicFun)
 add_subdirectory(acmstrdec)
 add_subdirectory(acmstrenc)

+ 1 - 15
Other/acmstrdec/CMakeLists.txt

@@ -29,18 +29,4 @@ else()
 endif(WIN32)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else(MSVC)
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/acmstrenc/CMakeLists.txt

@@ -30,18 +30,4 @@ else()
 endif(WIN32)
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-		RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-		ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-		LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-		RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-		ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-		LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-		COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/libCMBPrint/CMakeLists.txt

@@ -23,18 +23,4 @@ target_compile_definitions(${MODULE_NAME} PUBLIC "CMB_CARD_TRACK_EXPORTS")
 target_link_libraries(${MODULE_NAME} PRIVATE 
 )
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else(MSVC)
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 14
Other/libRestfulFunc/CMakeLists.txt

@@ -36,22 +36,9 @@ target_compile_definitions(${MODULE_NAME} PUBLIC "RESTFULPUBLIC_EXPORTS")
 target_link_libraries(${MODULE_NAME} PRIVATE 
     ${CONAN_PKG_LIBS_OPENSSL} ${CONAN_LIBS_CPPRESTSDK} ${CONAN_PKG_LIBS_JSONCPP})
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else(MSVC)
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 if(BUILD_TESTING)
     add_subdirectory(test)
 endif(BUILD_TESTING)
 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 15
Other/libaudiomgr/CMakeLists.txt

@@ -58,18 +58,4 @@ target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBAUDIOMGR_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/libfilecryption/CMakeLists.txt

@@ -32,18 +32,4 @@ target_link_directories(${MODULE_NAME} PRIVATE
 set(${MODULE_PREFIX}_LIBS ${CONAN_PKG_LIBS_LIBKYSM})
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else(MSVC)
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/liblog4rvcother/CMakeLists.txt

@@ -26,18 +26,4 @@ if(MSVC)
 endif(MSVC)
 target_link_libraries(${MODULE_NAME} CONAN_PKG::log4cplus ${OTHER_LIBS})
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else(MSVC)
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 5 - 0
Other/liblog4vendor/CMakeLists.txt

@@ -43,6 +43,11 @@ install(TARGETS ${MODULE_NAME}
     COMPONENT libraries)
 endif(MSVC)
 
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
+endif()
+
 if(BUILD_TESTING)
     add_subdirectory(test)
 endif(BUILD_TESTING)

+ 1 - 15
Other/libpublicFun/CMakeLists.txt

@@ -53,22 +53,8 @@ target_link_directories(${MODULE_NAME} PRIVATE ${CONAN_LIB_DIRS_BOOST})
 # 添加需要依赖的其他共享库(包括系统库)
 target_link_libraries(${MODULE_NAME} CONAN_PKG::OpenSSL ${Boost_LIBRARIES})
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else(MSVC)
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 if(BUILD_TESTING)
 add_subdirectory(test)
 endif(BUILD_TESTING)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 17
Other/libscreencodec/CMakeLists.txt

@@ -26,20 +26,4 @@ else()
     target_link_libraries(${MODULE_NAME} PRIVATE ${CONAN_PKG_LIBS_ZLIB})
 endif(MSVC)
 
-
-
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 14
Other/win/libaudions/CMakeLists.txt

@@ -51,19 +51,7 @@ target_compile_definitions(${MODULE_NAME} PUBLIC "LIBAUDIONS_EXPORTS")
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})  
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 # 设置要依赖拷贝的第三方库
 if(MSVC)
@@ -72,4 +60,3 @@ else()
 set(OTHER_CONAN_DEP_LIBS ${OTHER_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS} PARENT_SCOPE)
 ENDIF(MSVC)
 
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 15
Other/win/libaudioqueue/CMakeLists.txt

@@ -34,18 +34,4 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBAUDIOQUEUE_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/win/libaudiorender/CMakeLists.txt

@@ -29,18 +29,4 @@ target_link_libraries(${MODULE_NAME} PRIVATE
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBAUDIORENDER_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/win/libbizchan/CMakeLists.txt

@@ -59,19 +59,7 @@ endif(WIN32)
 
 target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS})
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 # 设置要依赖拷贝的第三方库
 if(MSVC)
@@ -79,5 +67,3 @@ 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)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 15
Other/win/libfacecapture/CMakeLists.txt

@@ -36,19 +36,7 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
 	${CUSTOM_OPENCV_LIBS}
 	)
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 
 # 设置要依赖拷贝的第三方库
@@ -57,5 +45,3 @@ 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} ${CONAN_BIN_DIRS_OPENCV} PARENT_SCOPE)
 ENDIF(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 15
Other/win/libimgplayer/CMakeLists.txt

@@ -34,18 +34,4 @@ target_include_directories(${MODULE_NAME} PRIVATE
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBIMAGPLAYER_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 17
Other/win/libmediaplayer/CMakeLists.txt

@@ -50,26 +50,10 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS} PRIVATE
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBMEDIAPLAYER_EXPORTS")
 
-
-
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 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)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 16
Other/win/libpictureplayer/CMakeLists.txt

@@ -30,25 +30,10 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	PRIVATE
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBPICTUREPLAYER_EXPORTS")
 
-
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 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)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 15
Other/win/libsharememory/CMakeLists.txt

@@ -15,18 +15,4 @@ target_include_directories(${MODULE_NAME} PRIVATE
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBSHAREMEMORY_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/win/libvideohorflip/CMakeLists.txt

@@ -59,18 +59,4 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBVIDEOHORFLIP_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/win/libvideoqueue/CMakeLists.txt

@@ -40,18 +40,4 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBVIDEOQUEUE_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/win/libvideorecord/CMakeLists.txt

@@ -73,24 +73,10 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS} PRIVATE
 	
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBVIDEORECORD_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 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} ${CONAN_BIN_DIRS_OPENCV} PARENT_SCOPE)
 ENDIF(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 1 - 15
Other/win/libvideorender/CMakeLists.txt

@@ -31,18 +31,4 @@ target_link_libraries(${MODULE_NAME} PRIVATE ${${MODULE_PREFIX}_LIBS}	PRIVATE
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBVIDEORENDER_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/win/libwmpplayer/CMakeLists.txt

@@ -73,18 +73,4 @@ target_include_directories(${MODULE_NAME} PRIVATE
 
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBWMPPLYAER_EXPORTS")
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})

+ 1 - 15
Other/win/showdev/CMakeLists.txt

@@ -76,19 +76,7 @@ else()
 target_compile_definitions(${MODULE_NAME} PUBLIC "LIBRELEASE_MODE")
 endif(RVC_DEBUG_MODE)
 
-if(MSVC)
-	install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT develops EXCLUDE_FROM_ALL
-    LIBRARY DESTINATION "${RVC_LIBRARY_PATH}" COMPONENT libraries
-    )
-else()
-install(TARGETS ${MODULE_NAME} 
-    RUNTIME DESTINATION "${RVC_RUNTIME_PATH}"
-    ARCHIVE DESTINATION "${RVC_LIBRARY_PATH}"
-    LIBRARY DESTINATION "${RVC_RUNTIME_PATH}"
-    COMPONENT libraries)
-endif(MSVC)
+deploy_others(${MODULE_PREFIX} ${MODULE_NAME})
 
 # 设置要依赖拷贝的第三方库
 if(MSVC)
@@ -96,5 +84,3 @@ 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)
-
-set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "other/")

+ 4 - 0
Tool/GuardianBase/CMakeLists.txt

@@ -31,4 +31,8 @@ install(TARGETS ${MODULE_NAME}
     COMPONENT libraries)
 endif(MSVC)
 
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
+endif()
+
 set_property(TARGET ${MODULE_NAME}  PROPERTY FOLDER "tools/")

+ 5 - 0
Tool/VTMLauncher/CMakeLists.txt

@@ -44,4 +44,9 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_LIBRARY_PATH}"
 	COMPONENT libraries)
 
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    get_target_property(OUTPUT_FILENAME ${MODULE_NAME} OUTPUT_NAME)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${OUTPUT_FILENAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
+endif()
+
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "tools/")

+ 4 - 0
Tool/guardian/CMakeLists.txt

@@ -26,4 +26,8 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_LIBRARY_PATH}"
 	COMPONENT libraries)
 
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
+endif()
+
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "tools/")

+ 4 - 0
Tool/sprestart/CMakeLists.txt

@@ -19,4 +19,8 @@ install(TARGETS ${MODULE_NAME}
     LIBRARY DESTINATION "${RVC_LIBRARY_PATH}"
 	COMPONENT libraries)
 
+if (WITH_PDB_SAVE AND MSVC AND BUILD_SHARED_LIBS)
+    install(FILES ${RVC_PDB_BINARY_DIR}/${MODULE_NAME}.pdb DESTINATION ${RVC_PDBSAVE_PATH} COMPONENT symbols)
+endif()
+
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "tools/")

+ 3 - 2
addin/cmake/ConfigOptions.cmake

@@ -25,8 +25,6 @@ option(WITH_IPP "Use Intel Performance Primitives." OFF)
 
 option(BUILD_TESTING "Build the project test case." OFF)
 
-option(WITH_DEBUG_SYMBOLS "Pack debug symbols to installer" OFF)
-
 option(WITH_THIRD_PARTY "Build third-party components" ON)
 
 option(BUILD_MODULE "whether build entity module or not" ON)
@@ -54,3 +52,6 @@ option(WITH_UNAUTHORIZED_RES "download other resource file or for skipping big f
 
 option(DEVOPS_INSTALL_SWITCH "install at devpos for pkging as zip easily" OFF)
 
+option(WITH_PDB_SAVE "save pdb file, copy pdb 2 version and pack from it" OFF)
+
+option(WITH_PDB_SAVEV2 "save pdb file, pack pdb from build dir directily" OFF)