CMake build system update
- Extending CMakeLists.txt to support builds with VC2012. - Fix some typo in CMakeLists.txt - Introduces experimental WITH_AVX_CPU to build with /arch:AVX (VC11 only)
This commit is contained in:
@@ -587,15 +587,29 @@ elseif(WIN32)
|
||||
endif()
|
||||
|
||||
if(WITH_CODEC_FFMPEG)
|
||||
install(
|
||||
FILES
|
||||
${LIBDIR}/ffmpeg/lib/avcodec-53.dll
|
||||
${LIBDIR}/ffmpeg/lib/avformat-53.dll
|
||||
${LIBDIR}/ffmpeg/lib/avdevice-53.dll
|
||||
${LIBDIR}/ffmpeg/lib/avutil-51.dll
|
||||
${LIBDIR}/ffmpeg/lib/swscale-2.dll
|
||||
DESTINATION ${TARGETDIR}
|
||||
)
|
||||
if(MSVC11)
|
||||
install(
|
||||
FILES
|
||||
${LIBDIR}/ffmpeg/lib/avcodec-54.dll
|
||||
${LIBDIR}/ffmpeg/lib/avformat-54.dll
|
||||
${LIBDIR}/ffmpeg/lib/avdevice-54.dll
|
||||
${LIBDIR}/ffmpeg/lib/avutil-52.dll
|
||||
${LIBDIR}/ffmpeg/lib/avfilter-3.dll
|
||||
${LIBDIR}/ffmpeg/lib/swresample-0.dll
|
||||
${LIBDIR}/ffmpeg/lib/swscale-2.dll
|
||||
DESTINATION ${TARGETDIR}
|
||||
)
|
||||
else()
|
||||
install(
|
||||
FILES
|
||||
${LIBDIR}/ffmpeg/lib/avcodec-53.dll
|
||||
${LIBDIR}/ffmpeg/lib/avformat-53.dll
|
||||
${LIBDIR}/ffmpeg/lib/avdevice-53.dll
|
||||
${LIBDIR}/ffmpeg/lib/avutil-51.dll
|
||||
${LIBDIR}/ffmpeg/lib/swscale-2.dll
|
||||
DESTINATION ${TARGETDIR}
|
||||
)
|
||||
endif()
|
||||
if(WITH_MINGW64)
|
||||
install(
|
||||
FILES
|
||||
|
Reference in New Issue
Block a user