Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/creator/CMakeLists.txt')
-rw-r--r--source/creator/CMakeLists.txt14
1 files changed, 6 insertions, 8 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 43fec85b5bf..315cd5312cf 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -25,9 +25,6 @@
#
# ***** END GPL LICENSE BLOCK *****
-# So BUILDINFO and BLENDERPATH strings are automatically quoted
-cmake_policy(SET CMP0005 NEW)
-
setup_libdirs()
blender_include_dirs(
@@ -136,6 +133,7 @@ if(WIN32 AND NOT UNIX)
endif()
if(WITH_BUILDINFO)
+ add_definitions(-DWITH_BUILDINFO)
# --------------------------------------------------------------------------
# These defines could all be moved into the header below
string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
@@ -547,11 +545,11 @@ elseif(WIN32)
if(WITH_CODEC_FFMPEG)
install(
FILES
- ${LIBDIR}/ffmpeg/lib/avcodec-52.dll
- ${LIBDIR}/ffmpeg/lib/avformat-52.dll
- ${LIBDIR}/ffmpeg/lib/avdevice-52.dll
- ${LIBDIR}/ffmpeg/lib/avutil-50.dll
- ${LIBDIR}/ffmpeg/lib/swscale-0.dll
+ ${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}
)