From 3cbe53c5d27f4ed4a664f318a1ee0c1e6d172a23 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Fri, 1 Jul 2011 12:14:51 +0000 Subject: [PATCH] got back to the old DLL naming scheme (opencv_core230_vs2001_64d.dll => opencv_core230[d].dll) --- CMakeLists.txt | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c57e4a3db7..e55190d341 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,35 +79,8 @@ set(OPENCV_VERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VER set(OPENCV_SOVERSION "${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}") if(WIN32) - set(OPENCV_DLL_VERSION_SUFFIX "") # Postfix of DLLs: - if(${CMAKE_GENERATOR} MATCHES "(MinGW)|(MSYS)") - set(OPENCV_DLL_VERSION_SUFFIX "${OPENCV_DLL_VERSION_SUFFIX}_mingw") - endif() - - if(${CMAKE_GENERATOR} MATCHES "Visual.*") - set(OPENCV_DLL_VERSION_SUFFIX "${OPENCV_DLL_VERSION_SUFFIX}_vs") - - if(${CMAKE_GENERATOR} MATCHES "Visual Studio 8 2005.*") - set(OPENCV_DLL_VERSION_SUFFIX "${OPENCV_DLL_VERSION_SUFFIX}2005") - endif() - if(${CMAKE_GENERATOR} MATCHES "Visual Studio 9 2008.*") - set(OPENCV_DLL_VERSION_SUFFIX "${OPENCV_DLL_VERSION_SUFFIX}2008") - endif() - if(${CMAKE_GENERATOR} MATCHES "Visual Studio 10.*") - set(OPENCV_DLL_VERSION_SUFFIX "${OPENCV_DLL_VERSION_SUFFIX}2010") - endif() - endif() - - if(${CMAKE_GENERATOR} MATCHES "Visual Studio.*Win64") - set(OPENCV_DLL_VERSION_SUFFIX "${OPENCV_DLL_VERSION_SUFFIX}_64") - endif() - - if(NOT BUILD_SHARED_LIBS) - set(OPENCV_DLL_VERSION_SUFFIX "${OPENCV_DLL_VERSION_SUFFIX}l") - endif() - - set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}${OPENCV_DLL_VERSION_SUFFIX}") + set(OPENCV_DLLVERSION "${OPENCV_VERSION_MAJOR}${OPENCV_VERSION_MINOR}${OPENCV_VERSION_PATCH}") set(OPENCV_DEBUG_POSTFIX d) else() # Postfix of so's: