diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2020-03-28 04:37:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-27 20:37:33 -0700 |
| commit | edfce3b4558644d61fbef4c88ff4bd106b0809f8 (patch) | |
| tree | 9256e71392b4f2aa7f5c957b732bb9eb35d976fd /ports/corrade | |
| parent | 9efff1124a3ce8d648146a0b69c7cb38fb9ebe1e (diff) | |
| download | vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.tar.gz vcpkg-edfce3b4558644d61fbef4c88ff4bd106b0809f8.zip | |
[magnum/magnum-plugins] Fix patches for --head builds (#10158)
* [magnum] Update patches for --head builds
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum-plugins] Remove obsolete patch
Since basisu port has been updated, we can now use it without patching
the magnum-plugins code for compatibility.
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade] Remove obsolete warning and flag
Signed-off-by: Squareys <squareys@googlemail.com>
* [magnum] Rename patches to reflect order of application
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade/magnum/magnum-plugins] Update port versions
Signed-off-by: Squareys <squareys@googlemail.com>
Diffstat (limited to 'ports/corrade')
| -rw-r--r-- | ports/corrade/CONTROL | 2 | ||||
| -rw-r--r-- | ports/corrade/portfile.cmake | 10 |
2 files changed, 1 insertions, 11 deletions
diff --git a/ports/corrade/CONTROL b/ports/corrade/CONTROL index a8217b2e8..091144941 100644 --- a/ports/corrade/CONTROL +++ b/ports/corrade/CONTROL @@ -1,5 +1,5 @@ Source: corrade -Version: 2019.10 +Version: 2019.10-1 Description: C++11/C++14 multiplatform utility library Homepage: https://magnum.graphics/corrade/ Default-Features: interconnect, pluginmanager, testsuite, utility diff --git a/ports/corrade/portfile.cmake b/ports/corrade/portfile.cmake index 76f76959b..3c82bd94b 100644 --- a/ports/corrade/portfile.cmake +++ b/ports/corrade/portfile.cmake @@ -25,16 +25,6 @@ foreach(_feature IN LISTS ALL_FEATURES) endif() endforeach() -if(NOT VCPKG_CMAKE_SYSTEM_NAME) - # building for Windows desktop - if (VCPKG_PLATFORM_TOOLSET STREQUAL "v142" AND NOT VCPKG_USE_HEAD_VERSION) - message("**********") - message("WARNING: Visual Studio 2019 is not official supported by Corrade/Magnum team. Please use --head version if you intend to have upstream support.") - message("**********") - set(_CUSTOM_BUILD_FLAGS "-DCORRADE_MSVC2017_COMPATIBILITY=ON") - endif() -endif() - vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA # Disable this option if project cannot be built with Ninja |