aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2017-10-23 12:16:09 -0700
committerGitHub <noreply@github.com>2017-10-23 12:16:09 -0700
commita256eb0875cc2bac0e22072d78e6a3e4bed5982a (patch)
treef29657eea1fe5c6c3d46f2da37996285ccb019d9
parent0b6e08b14823a78c21733bd1a370d60a67b91db1 (diff)
parent65fa778cf62bcd5794b5a24edd867a7e7f1298d8 (diff)
downloadvcpkg-a256eb0875cc2bac0e22072d78e6a3e4bed5982a.tar.gz
vcpkg-a256eb0875cc2bac0e22072d78e6a3e4bed5982a.zip
Merge pull request #2022 from Farwaykorse/master
[CppWinRT] Update to October 2017 release
-rw-r--r--ports/cppwinrt/CONTROL2
-rw-r--r--ports/cppwinrt/portfile.cmake10
2 files changed, 8 insertions, 4 deletions
diff --git a/ports/cppwinrt/CONTROL b/ports/cppwinrt/CONTROL
index 4f160a6e0..cd911b99e 100644
--- a/ports/cppwinrt/CONTROL
+++ b/ports/cppwinrt/CONTROL
@@ -1,3 +1,3 @@
Source: cppwinrt
-Version: fall_2017_creators_update_for_vs_15.3-1
+Version: fall_2017_creators_update_for_vs_15.3-2
Description: C++/WinRT is a standard C++ language projection for the Windows Runtime.
diff --git a/ports/cppwinrt/portfile.cmake b/ports/cppwinrt/portfile.cmake
index 703f9b6a1..ec1cb0603 100644
--- a/ports/cppwinrt/portfile.cmake
+++ b/ports/cppwinrt/portfile.cmake
@@ -9,9 +9,13 @@ vcpkg_from_github(
)
# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/license DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppwinrt/license.txt ${CURRENT_PACKAGES_DIR}/share/cppwinrt/copyright)
+file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/cppwinrt)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/cppwinrt/LICENSE ${CURRENT_PACKAGES_DIR}/share/cppwinrt/copyright)
# Copy the cppwinrt header files
file(GLOB HEADER_FILES ${SOURCE_PATH}/10.0.16299.0/winrt/*)
-file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/winrt)
+file(
+ COPY ${HEADER_FILES}
+ DESTINATION ${CURRENT_PACKAGES_DIR}/include/winrt
+ REGEX "\.(gitattributes|gitignore)$" EXCLUDE
+)