Commit: c8a9764987a8c1e7ea0093e8a0b028a65af6ee33
Author: Martijn Berger
Date: Fri Nov 14 10:49:01 2014 +0100
Branches: master
https://developer.blender.org/rBc8a9764987a8c1e7ea0093e8a0b028a65af6ee33
Cmake add installation of redistributables for msvc 2013
===================================================================
M CMakeLists.txt
M source/creator/CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc4c9c5..7bc2560 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 4cbfe9a..6ef99d4 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -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()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
