This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via da90f247541d7a3e3cd8ae32fe74450e8ffb46b8 (commit)
via 3578e86272b16b303edd640f29781dd316a857a4 (commit)
from f79c8a9fa000f7e3b4cdb984cd91a709cb42bce6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da90f247541d7a3e3cd8ae32fe74450e8ffb46b8
commit da90f247541d7a3e3cd8ae32fe74450e8ffb46b8
Merge: f79c8a9 3578e86
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Jan 10 11:00:19 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Tue Jan 10 11:00:19 2017 -0500
Merge topic 'issue-16513-concrt140-dll' into next
3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3578e86272b16b303edd640f29781dd316a857a4
commit 3578e86272b16b303edd640f29781dd316a857a4
Author: Taylor Braun-Jones <tay...@braun-jones.org>
AuthorDate: Fri Dec 16 18:02:48 2016 -0500
Commit: Taylor Braun-Jones <tay...@braun-jones.org>
CommitDate: Fri Dec 16 18:02:48 2016 -0500
InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
Fixes #16513
diff --git a/Modules/InstallRequiredSystemLibraries.cmake
b/Modules/InstallRequiredSystemLibraries.cmake
index b0446c9..f4ae091 100644
--- a/Modules/InstallRequiredSystemLibraries.cmake
+++ b/Modules/InstallRequiredSystemLibraries.cmake
@@ -182,7 +182,10 @@ if(MSVC)
"${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
)
if(NOT v VERSION_LESS 14)
- list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll")
+ list(APPEND __install__libs
+ "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll"
+ "${MSVC${v}_CRT_DIR}/concrt${v}0.dll"
+ )
else()
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll")
endif()
@@ -197,7 +200,10 @@ if(MSVC)
"${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll"
)
if(NOT v VERSION_LESS 14)
- list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll")
+ list(APPEND __install__libs
+ "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll"
+ "${MSVC${v}_CRT_DIR}/concrt${v}0d.dll"
+ )
else()
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll")
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/InstallRequiredSystemLibraries.cmake | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
