[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-500-g8d5c192
Brad King
brad.king at kitware.com
Wed Jun 22 08:33:59 EDT 2016
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 8d5c192eebf9ab065f614779038184ccf14320d0 (commit)
via 493ed129d6d77bda6e18cc3877bc7794b624f9ac (commit)
from dbfd55d78af161f004c9f6280ee26909643b1007 (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=8d5c192eebf9ab065f614779038184ccf14320d0
commit 8d5c192eebf9ab065f614779038184ccf14320d0
Merge: dbfd55d 493ed12
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 22 08:33:58 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 22 08:33:58 2016 -0400
Merge topic 'vs-sdk-refs' into next
493ed129 Fix VS_SDK_REFERENCES failure in VSWinStorePhone
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=493ed129d6d77bda6e18cc3877bc7794b624f9ac
commit 493ed129d6d77bda6e18cc3877bc7794b624f9ac
Author: Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Tue Jun 21 18:21:44 2016 -0700
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 22 08:33:26 2016 -0400
Fix VS_SDK_REFERENCES failure in VSWinStorePhone
Make the test depend on the Debug Universal CRT which should always be included in the SDK.
diff --git a/Tests/VSWinStorePhone/CMakeLists.txt b/Tests/VSWinStorePhone/CMakeLists.txt
index 5429673..14d532a 100644
--- a/Tests/VSWinStorePhone/CMakeLists.txt
+++ b/Tests/VSWinStorePhone/CMakeLists.txt
@@ -136,7 +136,7 @@ if("${SHORT_VERSION}" STREQUAL "10.0")
set_property(TARGET ${EXE_NAME} PROPERTY VS_IOT_EXTENSIONS_VERSION "${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
# Add a reference to an SDK
- set_property(TARGET ${EXE_NAME} PROPERTY VS_SDK_REFERENCES "Microsoft.NET.Native.Runtime.1.1, Version=1.1")
+ set_property(TARGET ${EXE_NAME} PROPERTY VS_SDK_REFERENCES "Microsoft.UniversalCRT.Debug, Version=${CMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION}")
endif()
-----------------------------------------------------------------------
Summary of changes:
Tests/VSWinStorePhone/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list