From 8bd2e9816ad7adc16e66489cc1cf60d1620b9c81 Mon Sep 17 00:00:00 2001 From: Alexander Alekhin Date: Fri, 30 Jun 2017 12:56:57 +0300 Subject: [PATCH] cmake: don't add vs_version.rc for static modules (ts) --- cmake/OpenCVModule.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/OpenCVModule.cmake b/cmake/OpenCVModule.cmake index 4bcf633092..10a1264dc3 100644 --- a/cmake/OpenCVModule.cmake +++ b/cmake/OpenCVModule.cmake @@ -802,7 +802,9 @@ macro(_ocv_create_module) endforeach() endif() - if(WIN32 AND BUILD_SHARED_LIBS AND NOT OPENCV_VS_VERSIONINFO_SKIP) + if(WIN32 + AND (BUILD_SHARED_LIBS AND NOT "x${OPENCV_MODULE_TYPE}" STREQUAL "xSTATIC") + AND NOT OPENCV_VS_VERSIONINFO_SKIP) if(DEFINED OPENCV_VS_VERSIONINFO_FILE) set(_VS_VERSION_FILE "${OPENCV_VS_VERSIONINFO_FILE}") elseif(DEFINED OPENCV_VS_VERSIONINFO_${the_module}_FILE)