diff options
| author | Martijn Berger <martijn.berger@gmail.com> | 2014-11-14 12:49:01 +0300 |
|---|---|---|
| committer | Martijn Berger <martijn.berger@gmail.com> | 2014-11-14 12:49:01 +0300 |
| commit | c8a9764987a8c1e7ea0093e8a0b028a65af6ee33 (patch) | |
| tree | 1f04c58aceb47f2e181151e108b8cc2cbc5ca8dc | |
| parent | d35d9e64527fb10ab6b545607f8ff7d043c44663 (diff) | |
Cmake add installation of redistributables for msvc 2013
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | source/creator/CMakeLists.txt | 16 |
2 files changed, 19 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cc4c9c53d62..7bc2560dd16 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 4cbfe9a7e00..6ef99d42bb5 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() |