blender
/
blender
130
398
Fork 574
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cmake add installation of redistributables for msvc 2013

This commit is contained in:
Martijn Berger 2014-11-14 10:49:01 +01:00
parent d35d9e6452
commit c8a9764987
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -1154,6 +1154,9 @@ elseif(WIN32)
endif()
endif()
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP TRUE)
include(InstallRequiredSystemLibraries)
add_definitions(-DOIIO_STATIC_BUILD)
set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc /MP" CACHE STRING "MSVC MT C++ flags " FORCE)

16
source/creator/CMakeLists.txt
View File

@ -964,4 +964,20 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
install(TARGETS blender blender-launcher
DESTINATION ".")
if(MSVC12_REDIST_DIR)
if(CMAKE_CL_64)
set(_WIN_PLATFORM x64)
else()
set(_WIN_PLATFORM x86)
endif()
install(
FILES ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcp120.dll
${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.CRT/msvcr120.dll
DESTINATION ".")
if(WITH_OPENMP)
install(
FILES ${MSVC12_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC120.OpenMP/vcomp120.dll
DESTINATION ".")
endif()
endif()
endif()