diff options
| author | Cheney Wang <38240633+Cheney-W@users.noreply.github.com> | 2021-09-23 17:53:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-23 17:53:29 -0700 |
| commit | c6595d708fc62489bb87baf4ecbdfc6f2b4ff6e2 (patch) | |
| tree | 0dd7824e9e5b50322076a70e77fc64f7ba7ad7c0 /ports/directxsdk | |
| parent | 69521af149b3f75f1a04cd4408ead8f7d5fe908e (diff) | |
| download | vcpkg-c6595d708fc62489bb87baf4ecbdfc6f2b4ff6e2.tar.gz vcpkg-c6595d708fc62489bb87baf4ecbdfc6f2b4ff6e2.zip | |
[dxsdk-d3dx/directxsdk] Add message to handle the conflicts between these two ports (#20286)
* [dxsdk-d3dx] Modify the destination path
* [dxsdk-d3dx/directxsdk] Add message to handle the conflicts between these two ports
Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
Diffstat (limited to 'ports/directxsdk')
| -rw-r--r-- | ports/directxsdk/portfile.cmake | 4 | ||||
| -rw-r--r-- | ports/directxsdk/vcpkg.json | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ports/directxsdk/portfile.cmake b/ports/directxsdk/portfile.cmake index f684800f4..67551cffa 100644 --- a/ports/directxsdk/portfile.cmake +++ b/ports/directxsdk/portfile.cmake @@ -1,5 +1,9 @@ vcpkg_fail_port_install(ON_TARGET "LINUX" "OSX" "UWP" "ANDROID" ON_ARCH "arm")
+if(EXISTS "${CURRENT_INSTALLED_DIR}/share/dxsdk-d3dx/copyright")
+ message(FATAL_ERROR "Can't build ${PORT} if dxsdk-d3dx is installed. Please remove dxsdk-d3dx, and try to install ${PORT} again if you need it.")
+endif()
+
message(WARNING "Build ${PORT} is deprecated, untested in CI, and requires the use of the DirectSetup legacy REDIST solution. See https://aka.ms/dxsdk for more information.")
vcpkg_download_distfile(ARCHIVE
diff --git a/ports/directxsdk/vcpkg.json b/ports/directxsdk/vcpkg.json index b43961e7c..0d093e5bb 100644 --- a/ports/directxsdk/vcpkg.json +++ b/ports/directxsdk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "directxsdk", "version-string": "jun10", - "port-version": 3, + "port-version": 4, "description": "Legacy DirectX SDK", "homepage": "https://docs.microsoft.com/en-us/windows/win32/directx-sdk--august-2009-", "supports": "windows & !uwp & !arm", |