Z991239-527 #comment cmake: 优化CMAKe编译实体

addin/cmake/BuildMakeSettings.cmake

@@ -1,8 +1,6 @@
 SET(RVC_COMMON_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/Common)
 SET(RVC_TOOLKIT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/libtoolkit)
 
-
-
 # <ThirdPartyLib>$(MSBuildProjectDirectory)\..\..\ThirdParty\Release</ThirdPartyLib>
 SET(ThirdPartyLib "${PROJECT_SOURCE_DIR}/third_libraries/Release")
 

addin/cmake/ModMakeSettings.cmake

@@ -1,6 +1,5 @@
 SET(DevHeadPath "${PROJECT_SOURCE_DIR}/DevAdapter/include")
 
-
 set(MODULE_BASE_DIR "${PROJECT_SOURCE_DIR}/Module")
 
 SET(ModuleCommonHeadPath "${MODULE_BASE_DIR}/include")

module/CMakeLists.txt

@@ -7,8 +7,9 @@ endmacro(define_moudle)
 
 set(MODULE_BASE_LIBS spbase libtoolkit)
 if(NOT MSVC)
-    list(APPEND MODULE_BASE_LIBS winpr)
+   # list(APPEND MODULE_BASE_LIBS winpr)
 endif(NOT MSVC)
+set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
 
 #对于 Windows 设置实体的版本信息
 #定义共享库输出
@@ -47,7 +48,7 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     # 添加导出宏定义
     target_compile_definitions(${_module_name} PUBLIC "${_module_prefix}_EXPORTS")
     
-    target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_DIR}/include)
+    target_include_directories(${_module_name} PRIVATE ${MODULE_BASE_INCLUDES})
     
     configure_file("${MODULE_BASE_DIR}/include/modVer.h.in" "${CMAKE_CURRENT_BINARY_DIR}/modVer.h")
     target_include_directories(${_module_name} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})