#IQRV #comment [CMake] 框架共有宏还是放回到每个模块，影响SIPphone实体的加载

CMakeLists.txt

@@ -413,35 +413,6 @@ else()
 endif(SIMULATE_ON)#end simulate
 
 add_subdirectory(ThirdParty)
-
-######################## Framework lib CMake define begin ########################
-if(RVC_DEBUG_MODE)
-    set(RVCCOMM_LIB RVCCommD)
-    set(SPBASE_LIB spbased)
-    set(TOOLKIT_LIB libtoolkitd)
-else()
-    set(RVCCOMM_LIB RVCComm)
-    set(SPBASE_LIB spbase)
-    set(TOOLKIT_LIB libtoolkit)
-endif(RVC_DEBUG_MODE)
-set(WINPR_LIB winpr2)
-set(MODULE_BASE_LIBS ${SPBASE_LIB} ${TOOLKIT_LIB})
-set(MODULE_BASE_ALL_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB}) 
-if(NOT MSVC)
-    list(APPEND MODULE_BASE_LIBS ${WINPR_LIB})
-endif(NOT MSVC)
-set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
-
-SET(RVC_COMMON_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/Common PARENT_SCOPE)
-SET(RVC_TOOLKIT_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit PARENT_SCOPE)
-SET(RVC_WINPR_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include)
-
-SET(RVC_FRAMEWORK_LIBRARIES_DIR ${CONAN_LIB_DIRS_RVCFRAMEWORK})
-SET(RVC_FRAMEWORK_INCLUDES_DIR ${RVC_COMMON_INCLUDE_DIR} 
-    ${RVC_TOOLKIT_INCLUDE_DIR} ${RVC_WINPR_INCLUDE_DIR})
-
-######################## Framework lib CMake define end ########################
-
 add_subdirectory(Other)
 add_subdirectory(Module)
 add_subdirectory(Tool)

Module/CMakeLists.txt

@@ -6,6 +6,33 @@ macro(define_module _module_name)
 	string(TOUPPER "${MODULE_NAME}" MODULE_PREFIX)
 endmacro(define_module)
 
+if(RVC_DEBUG_MODE)
+    set(RVCCOMM_LIB RVCCommD)
+    set(SPBASE_LIB spbased)
+    set(TOOLKIT_LIB libtoolkitd)
+else()
+    set(RVCCOMM_LIB RVCComm)
+    set(SPBASE_LIB spbase)
+    set(TOOLKIT_LIB libtoolkit)
+endif(RVC_DEBUG_MODE)
+
+set(WINPR_LIB winpr2)
+
+set(MODULE_BASE_LIBS ${SPBASE_LIB} ${TOOLKIT_LIB})
+set(MODULE_BASE_ALL_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB}) 
+if(NOT MSVC)
+    list(APPEND MODULE_BASE_LIBS ${WINPR_LIB})
+endif(NOT MSVC)
+set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
+
+SET(RVC_COMMON_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/Common PARENT_SCOPE)
+SET(RVC_TOOLKIT_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit PARENT_SCOPE)
+SET(RVC_WINPR_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include)
+
+SET(RVC_FRAMEWORK_LIBRARIES_DIR ${CONAN_LIB_DIRS_RVCFRAMEWORK})
+SET(RVC_FRAMEWORK_INCLUDES_DIR ${RVC_COMMON_INCLUDE_DIR} 
+    ${RVC_TOOLKIT_INCLUDE_DIR} ${RVC_WINPR_INCLUDE_DIR})
+
 set(BUILD_MOUDLE_TEST OFF)
 if(BUILD_TESTING)
     set(BUILD_MOUDLE_TEST ON)

Tool/CMakeLists.txt

@@ -2,6 +2,34 @@ if(SIMULATE_ON)
 	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
 endif(SIMULATE_ON)
 
+######################## Framework lib CMake define begin ########################
+if(RVC_DEBUG_MODE)
+    set(RVCCOMM_LIB RVCCommD)
+    set(SPBASE_LIB spbased)
+    set(TOOLKIT_LIB libtoolkitd)
+else()
+    set(RVCCOMM_LIB RVCComm)
+    set(SPBASE_LIB spbase)
+    set(TOOLKIT_LIB libtoolkit)
+endif(RVC_DEBUG_MODE)
+set(WINPR_LIB winpr2)
+set(MODULE_BASE_LIBS ${SPBASE_LIB} ${TOOLKIT_LIB})
+set(MODULE_BASE_ALL_LIBS ${MODULE_BASE_LIBS} ${RVCCOMM_LIB}) 
+if(NOT MSVC)
+    list(APPEND MODULE_BASE_LIBS ${WINPR_LIB})
+endif(NOT MSVC)
+set(MODULE_BASE_INCLUDES ${ModuleCommonHeadPath} ${RVC_TOOLKIT_INCLUDE_DIR})
+
+SET(RVC_COMMON_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/Common PARENT_SCOPE)
+SET(RVC_TOOLKIT_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit PARENT_SCOPE)
+SET(RVC_WINPR_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include)
+
+SET(RVC_FRAMEWORK_LIBRARIES_DIR ${CONAN_LIB_DIRS_RVCFRAMEWORK})
+SET(RVC_FRAMEWORK_INCLUDES_DIR ${RVC_COMMON_INCLUDE_DIR} 
+    ${RVC_TOOLKIT_INCLUDE_DIR} ${RVC_WINPR_INCLUDE_DIR})
+
+######################## Framework lib CMake define end ########################
+
 file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
 
 foreach(dir ${all_valid_subdirs})