From: Ilya Lavrenov Date: Mon, 24 May 2021 16:19:07 +0000 (+0300) Subject: Merge pull request #20026 from ilya-lavrenov:inference-engine-version-from-cmake X-Git-Tag: submit/tizen/20220120.021815~1^2~72 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e1ddd32798fd177469b1aed3b5c7338b6f5c693;p=platform%2Fupstream%2Fopencv.git Merge pull request #20026 from ilya-lavrenov:inference-engine-version-from-cmake * Extract IE version from IE cmake config * Update cmake/OpenCVDetectInferenceEngine.cmake Co-authored-by: Maksim Shabunin --- diff --git a/cmake/OpenCVDetectInferenceEngine.cmake b/cmake/OpenCVDetectInferenceEngine.cmake index 216c02c3cc..2c0296d634 100644 --- a/cmake/OpenCVDetectInferenceEngine.cmake +++ b/cmake/OpenCVDetectInferenceEngine.cmake @@ -134,10 +134,14 @@ endif() # Add more features to the target if(INF_ENGINE_TARGET) + if(InferenceEngine_VERSION VERSION_GREATER_EQUAL "2021.4") + math(EXPR INF_ENGINE_RELEASE "${InferenceEngine_VERSION_MAJOR} * 1000000 + ${InferenceEngine_VERSION_MINOR} * 10000 + ${InferenceEngine_VERSION_PATCH} * 100") + endif() if(NOT INF_ENGINE_RELEASE) message(WARNING "InferenceEngine version has not been set, 2021.3 will be used by default. Set INF_ENGINE_RELEASE variable if you experience build errors.") + set(INF_ENGINE_RELEASE "2021030000") endif() - set(INF_ENGINE_RELEASE "2021030000" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2020.1.0.2 -> 2020010002)") + set(INF_ENGINE_RELEASE "${INF_ENGINE_RELEASE}" CACHE STRING "Force IE version, should be in form YYYYAABBCC (e.g. 2020.1.0.2 -> 2020010002)") set_target_properties(${INF_ENGINE_TARGET} PROPERTIES INTERFACE_COMPILE_DEFINITIONS "HAVE_INF_ENGINE=1;INF_ENGINE_RELEASE=${INF_ENGINE_RELEASE}" )