浏览代码

#IQRV #comment [CMake] 将框架的引用宏放到跟目录,方便其他模块引用

gifur 4 年之前
父节点
当前提交
9ed3a46a02
共有 2 个文件被更改,包括 30 次插入26 次删除
  1. 30 0
      CMakeLists.txt
  2. 0 26
      Module/CMakeLists.txt

+ 30 - 0
CMakeLists.txt

@@ -411,7 +411,37 @@ else()
 	message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
 
 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)

+ 0 - 26
Module/CMakeLists.txt

@@ -6,32 +6,6 @@ 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)