Browse Source

#IQRV #comment [DevAdapter][CMake] 添加开关 WITH_LOCAL_DEVLIB 用于本地编译适配器

gifur 4 years ago
parent
commit
2ffa96e404
2 changed files with 11 additions and 4 deletions
  1. 9 4
      DevAdapter/CMakeLists.txt
  2. 2 0
      addin/cmake/ConfigOptions.cmake

+ 9 - 4
DevAdapter/CMakeLists.txt

@@ -2,9 +2,14 @@
 
 if(RVC_VERSION)
     set(RVC_INTEGRATE_BUILD TRUE)
+    set(DEVADAPTER_USING_CONAN TRUE)
+    if(WITH_LOCAL_DEVLIB)
+        set(DEVADAPTER_USING_CONAN FALSE)
+    endif(WITH_LOCAL_DEVLIB)
 else()
     project(DevAdapter)
     cmake_minimum_required (VERSION 3.8)
+    set(DEVADAPTER_USING_CONAN FALSE)
 endif(RVC_VERSION)
 
 if(MSVC AND (CMAKE_SYSTEM_PROCESSOR MATCHES "i386|i686|x86|AMD64") )
@@ -37,7 +42,7 @@ endmacro(rvc_traverse_sub_cmake_dirs)
 
 macro(rvc_define_dependen_dirs)
     set(VENDOR_CURRENT_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}")
-    if(RVC_INTEGRATE_BUILD)
+    if(DEVADAPTER_USING_CONAN)
         STRING( REGEX REPLACE ".*/(.*)" "\\1" CURRENT_VENDOR_FOLDER ${CMAKE_CURRENT_SOURCE_DIR} )
         message(STATUS "vendor name : ${CURRENT_VENDOR_FOLDER}")
         string(TOUPPER ${CURRENT_VENDOR_FOLDER} CURRENT_VENDOR_FOLDER)
@@ -46,7 +51,7 @@ macro(rvc_define_dependen_dirs)
                 BASIC_SETUP CMAKE_TARGETS)
                 set(VENDOR_CURRENT_SOURCE_DIR ${CONAN_${CURRENT_VENDOR_FOLDER}_ROOT})
         endif()
-    endif(RVC_INTEGRATE_BUILD)
+    endif(DEVADAPTER_USING_CONAN)
     # 放置有源码的适配器依赖库工程文件
     set(VENDOR_CURRENT_DEPS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/deps")
     set(VENDOR_CURRENT_INCLUDE_DIR "${VENDOR_CURRENT_SOURCE_DIR}/include")
@@ -133,13 +138,13 @@ endif(NOT RVC_INTEGRATE_BUILD)
 message(STATUS "vendor log library: ${VENDOR_LOG_LIB_NAME}")
 
 # 通过conan的方式管理厂商库
-if(RVC_INTEGRATE_BUILD)
+if(DEVADAPTER_USING_CONAN)
     set(KEBA_CONAN_LIB_NAME keba/2020.1231.01@LR04.02_VendorLib/testing)
 	set(NANTIAN_CONAN_LIB_NAME nantian/2021.0108.01@LR04.02_VendorLib/testing)
 	set(GRG_CONAN_LIB_NAME grg/2021.0111.01@LR04.02_VendorLib/testing)
 	set(CW_CONAN_LIB_NAME cw/2020.1222.01@LR04.02_VendorLib/testing)
     set(GWI_CONAN_LIB_NAME gwi/2021.0104.01@LR04.02_VendorLib/testing)
-endif(RVC_INTEGRATE_BUILD)
+endif(DEVADAPTER_USING_CONAN)
 
     file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
       foreach(dir ${all_valid_subdirs})

+ 2 - 0
addin/cmake/ConfigOptions.cmake

@@ -31,4 +31,6 @@ option(SIMULATE_ON "/run/version/1.2.3.4/" ON)
 
 option(BUILD_DEVADAPTER "whether build device adapter or not" ON)
 
+option(WITH_LOCAL_DEVLIB "build dev adapter with local dependency libraries except conan" OFF)
+
 option(WITH_CI_NUMBER "increment build number, especially CI environment" OFF)