From 2b689f34f7034364a863e4b2db04469cc48ae817 Mon Sep 17 00:00:00 2001 From: Andrey Morozov Date: Fri, 1 Jul 2011 10:45:58 +0000 Subject: [PATCH] revert suffix in version --- CMakeLists.txt | 29 +---------------------------- 1 file changed, 1 insertion(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2cd2adabe1..887d46d8f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,35 +93,8 @@ list(GET OPENCV_VERSION_PARTS 2 OPENCV_VERSION_PATCH) 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: