diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-02-02 06:15:29 +0300 |
| commit | c3eb22e2ab0f4f96d64d1de7969966efd5d45066 (patch) | |
| tree | d0472fa9bc46c4ed73fdd8c55e0e4a2616c3178f /source/creator | |
| parent | 7003c8a143dea49a4e4ccc6b26283933d87f4a87 (diff) | |
| parent | 88e69806b977a6ec97c807f5e97db3bf68cff759 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index c5acd7e640e..b6229539cd9 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -1030,70 +1030,4 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE) COMPONENT Blender DESTINATION "." ) - if(CMAKE_CL_64) - set(_WIN_PLATFORM x64) - else() - set(_WIN_PLATFORM x86) - endif() - if(MSVC12_REDIST_DIR) - 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() - - if(MSVC14_REDIST_DIR) - set(KITSDIRx86 "$ENV{${ProgramFilesX86_NAME}}/Windows Kits/10/") - set(KITSDIR "$ENV{ProgramFiles}/Windows Kits/10/") - if(IS_DIRECTORY ${KITSDIR}) - set(KITSPATH "${KITSDIR}/Redist/ucrt/DLLs/${_WIN_PLATFORM}") - else() - if(IS_DIRECTORY ${KITSDIRx86}) - set(KITSPATH "${KITSDIRx86}/Redist/ucrt/DLLs/${_WIN_PLATFORM}") - else() - message(FATAL_ERROR "Windows 10 SDK directory not found") - endif() - endif() - FILE(TO_CMAKE_PATH ${KITSPATH} KITSPATH) - install( - FILES - ${KITSPATH}/api-ms-win-core-file-l1-2-0.dll - ${KITSPATH}/api-ms-win-core-file-l2-1-0.dll - ${KITSPATH}/api-ms-win-core-localization-l1-2-0.dll - ${KITSPATH}/api-ms-win-core-processthreads-l1-1-0.dll - ${KITSPATH}/api-ms-win-core-processthreads-l1-1-1.dll - ${KITSPATH}/api-ms-win-core-synch-l1-1-0.dll - ${KITSPATH}/api-ms-win-core-synch-l1-2-0.dll - ${KITSPATH}/api-ms-win-core-timezone-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-conio-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-convert-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-environment-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-filesystem-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-heap-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-locale-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-math-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-process-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-runtime-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-stdio-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-string-l1-1-0.dll - ${KITSPATH}/api-ms-win-crt-time-l1-1-0.dll - ${KITSPATH}/ucrtbase.dll - ${MSVC14_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC140.CRT/vcruntime140.dll - DESTINATION "." - ) - if(WITH_OPENMP) - install( - FILES ${MSVC14_REDIST_DIR}/${_WIN_PLATFORM}/Microsoft.VC140.OpenMP/vcomp140.dll - DESTINATION "." - ) - endif() - endif() endif() |