Commit 3cbe53c5 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

got back to the old DLL naming scheme (opencv_core230_vs2001_64d.dll => opencv_core230[d].dll)

parent a5d53e3e
......@@ -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:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment