瀏覽代碼

Z991239-1373 #comment 将opencv分成两个版本

ITC\80296915 4 年之前
父節點
當前提交
0ac2047cb5
共有 2 個文件被更改,包括 11 次插入0 次删除
  1. 6 0
      Module/mod_IDCertificate/CMakeLists.txt
  2. 5 0
      Other/libimageproc/CMakeLists.txt

+ 6 - 0
Module/mod_IDCertificate/CMakeLists.txt

@@ -8,9 +8,15 @@ file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE
 	)
 
 
+
+if(MSVC)
 conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
+BASIC_SETUP CMAKE_TARGETS)
+else()
+conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
+endif(MSVC)
 
 set(MOD_VERSION_STRING "1.0.0-dev1")
 add_module_libraries(${MODULE_PREFIX} ${MODULE_NAME} ${MOD_VERSION_STRING})

+ 5 - 0
Other/libimageproc/CMakeLists.txt

@@ -14,9 +14,14 @@ set(${MODULE_PREFIX}_SRCS
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 
+if(MSVC)
 conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/testing
+BASIC_SETUP CMAKE_TARGETS)
+else()
+conan_cmake_run(REQUIRES opencv/3.1.0@LR04.02_ThirdParty/stable
 BASIC_SETUP CMAKE_TARGETS
 BUILD missing)
+endif(MSVC)
 
 target_include_directories(${MODULE_NAME} PRIVATE
 	"${CONAN_RVCFRAMEWORK_ROOT}/include"