[cppwinrt] Update to version 2.0.201008.2 #14037
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
NancyLi1013
added
the
category:port-update
NancyLi1013
suggested changes
Oct 16, 2020
ports/cppwinrt/portfile.cmake
Outdated
| @@ -1,21 +1,49 @@ | |||
| include(vcpkg_common_functions) | |||
There was a problem hiding this comment.
Suggested change
| include(vcpkg_common_functions) |
This function is no longer needed. Please remove it.
ports/cppwinrt/portfile.cmake
Outdated
| DEBUG_CONFIGURATION Release | ||
| TARGET cppwinrt | ||
| OPTIONS /p:CppWinRTBuildVersion=${VERSION} | ||
| ) |
There was a problem hiding this comment.
You have added CMakeLists.txt, why does msbuild still require?
ports/cppwinrt/portfile.cmake
Outdated
| ) | ||
| vcpkg_install_cmake() | ||
|
|
||
| file(COPY ${CURRENT_PACKAGES_DIR}/share DESTINATION ${CURRENT_PACKAGES_DIR}/debug) |
There was a problem hiding this comment.
What are the files in this directory ${CURRENT_PACKAGES_DIR}/share? Why do you copy these files to /debug direcroty?
ports/cppwinrt/portfile.cmake
Outdated
Comment on lines
48
to
13
| 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) |
There was a problem hiding this comment.
Suggested change
| 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) | |
| file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) |
ports/cppwinrt/portfile.cmake
Outdated
|
|
||
| vcpkg_fixup_cmake_targets() | ||
|
|
||
| file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug) |
There was a problem hiding this comment.
Why do you remove all the files in /debug directory?
scripts/ci.baseline.txt
Outdated
Comment on lines
1857
to
1864
|
|
||
| # cppwinrt.exe does not build on arm - this is known by cppwinrt and is even shown in its build files | ||
| cppwinrt:arm64-windows = fail | ||
| cppwinrt:arm-uwp = fail | ||
|
|
||
| # cppwinrt will not work on non windows platforms | ||
| cppwinrt:x64-linux = skip | ||
| cppwinrt:x64-osx = skip |
There was a problem hiding this comment.
Suggested change
| # cppwinrt.exe does not build on arm - this is known by cppwinrt and is even shown in its build files | |
| cppwinrt:arm64-windows = fail | |
| cppwinrt:arm-uwp = fail | |
| # cppwinrt will not work on non windows platforms | |
| cppwinrt:x64-linux = skip | |
| cppwinrt:x64-osx = skip |
If this port cannot support these triplets, you can add Supports: !(arm|osx|linux) to vcpkg.json file. There is no need to add these codes in ci.baseline.txt.
|
Okay, I have made the recommended changes and a few more. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates C++/WinRT (cppwinrt) to version 2.0.201008.2. This required a new way of installing it because the repository no longer includes pre-built header files. This put more restrictions on what triplets are supported, limiting it to Windows only. It also now requires a version of the Windows SDK to be installed. With the large change needed to get the header files, a CMakeLists.txt was added, as to allow easier usage to with cmake.
Which triplets are supported/not supported?
x86-windows and x64-windows are supported. arm-windows and arm64-windows may work on arm computers, I have no way to test. It may be possible to support all triplets as the cppwinrt.exe app only needs a header only library to build, but we also need the Windows' SDK for the new process.
Does your PR follow the maintainer guide? Yes, including a manifest file.