Commit Graph

29 Commits

Author SHA1 Message Date
Kai Pastor
47633daa65
[vcpkg-scripts] Catch use of ambiguous cmake vars (#34546)
Avoid wrong use of popular but ambiguous variables (`WIN32` etc.) in
scripts and portfiles by detection in CI.

Sometimes the variables are used wrongly, and sometimes this isn't
caught in PR review. This PR tries to catch those variables (when in the
active code path in script mode). [This can happen to every
contributor](https://github.com/microsoft/vcpkg/pull/34356#discussion_r1360074122),
even if he/she knows the rules ... vcpkg is raising the bar higher than
usual, having to deal with targets and hosts even in script mode.

(`b2-options.cmake` (boost fragment) shows where we get if we don't pay
attention: the same code being used in script mode (`WIN32` meaning
host) and in project mode (`WIN32` meaning target).)

The new check doesn't break any user builds because it relies on command
line options. However it changes the ABI hashes.
2024-06-14 11:40:01 -07:00
autoantwort
522c29c421
[magnum-plugins] fix build of features (#35246) 2023-11-29 01:05:51 -08:00
Cheney Wang
3f8513efb0
[vcpkg baseline][magnum-plugins] Fix corrade-rc not found (#33930)
* [vcpkg baseline][magnum-plugins] Fix corrade-rc not found

* code clean up
2023-09-22 11:27:59 -07:00
autoantwort
28e440beea
[magnum-plugins] fix SHA512 (#30123) 2023-03-13 11:53:14 -07:00
Cheney Wang
74a4c99417
[magnum-*] Remove accidentally generated parameter and optimized portfile.cmake (#27608)
* [magnum-*] Remove accidentally generated parameter and optimized portfile.cmake

* x-add-version

* Use vcpkg_check_features

* x-add-version
2022-11-04 14:18:54 -07:00
pezcode
b9ca38893e
[magnum-plugins] Update head features and bundled dependency (#21307)
* [magnum-plugins] Update head features and bundled dependency

* [magnum-plugins] Format vcpkg.json

* [magnum-plugins] Use vcpkg_extract_source_archive

* [magnum-plugins] Formatting

* [magnum-plugins] Replace deprecated functions

* [magnum-plugins] add zstd dependency to basisimageconverter and basisimporter

* [magnum-plugins] Update version
2021-11-18 20:13:14 -08:00
Jonathan Hale
8655bfd4b3
[corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435)
* [magnum/-plugins] Remove obsolete patches that no longer apply

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade] Make feature to flag translation consistent to fix warning

Consistent with magnum & magnum-plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix warning message for dlls without matching pdbs always displayed

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix the baseline version

* Revert the changes in vcpkg_copy_pdbs.cmake

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-09-02 13:24:33 -07:00
Jonathan Hale
70610f4494
[magnum,-plugins] Fix deprecated use of vcpkg_check_features (#17016)
Signed-off-by: Squareys <squareys@googlemail.com>
2021-04-29 13:49:04 -07:00
Jonathan Hale
e7377f7992
[magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (#16245)
* [magnum] Correctly deploy shaderconverter and sceneconverter plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Only remove plugin lib dirs for Windows platforms

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Clean up deletion of plugin libs and clarify in comment

Signed-off-by: Squareys <squareys@googlemail.com>

* Update versions

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
2021-02-18 13:02:27 -08:00
Jonathan Hale
795588570a
[magnum,magnum-plugins] Add vulkan and shaderconverter features (#15163)
* [magnum,magnum-plugins] Add vulkan and shaderconverter features

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Add warning for features unavailable in non-head version

Signed-off-by: Squareys <squareys@googlemail.com>

* update version record

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2021-01-26 15:03:54 -08:00
Jack·Boos·Yu
c0d7b3970c
[magnum-plugins] Fix file conflict with stb (#12458) 2020-07-20 19:47:16 -07:00
Jonathan Hale
5e40afca0d
[corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06 (#12211)
* [magnum] Improve maintainability of feature to cmake flag conversion

* [magnum] Ignore features not supported on current platform

Allows `vcpkg install magnum[*]` on any platform.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add cglcontext and windowlesscglapplication features

* docs: Update valid VCPKG_CMAKE_SYSTEM_NAME values

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace deprecated basisu with archive download

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add meshoptimizersceneconverter feature

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Also use vcpkg_check_features

Analog to magnum port.

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum,*-plugins,*-extras,*-integration] Update to v2020.06

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Add initial port

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Replace meshoptimizer download with feature dependency

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade,magnum-*] Fix license installation command

Signed-off-by: Squareys <squareys@googlemail.com>

* [meshoptimizer] Use vcpkg_fixup_cmake_targets

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2020-07-14 08:38:18 -07:00
Jonathan Hale
edfce3b455
[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>
2020-03-27 20:37:33 -07:00
Jonathan Hale
a3ab4500a4 [magnum-plugins] Fix basisimporter/basisimageconverter features (#8939)
* [magnum-plugins] Patch FindBasisUniversal to find prebuilt basisu

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Patch BasisImporter to use slightly outdated basisu

jherico's fork which the vcpkg port is based on does not integrate
54304fa014
yet, which renamed a parameter.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Only apply FindBasisUniversal patch on release

The change is integrated upstream for --head builds already.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Download large patch from GitHub history
2019-11-25 10:31:55 -08:00
Jonathan Hale
3b868ac769 Update magnum ports to new version (#8742)
* [corrade/magnum-*] Remove obsolete patches

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade/magnum-*] Update to 2019.10

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add new features

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-integration] Add new features

Signed-off-by: Squareys <squareys@googlemail.com>
2019-10-25 13:05:28 -07:00
Stefano Sinigardi
726c111481 [vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
2019-10-07 10:35:13 -07:00
Jonathan Hale
6c6516621f [corrade,magnum,-integration,-extras,-plugins] Update Magnum to v2019.01 (#5312)
* [corrade] Update to v2019.01

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Update to v2019.01, remove shapes and glutapplication features

These features were deprecated in earlier versions and now removed.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-(extras,plugins,integration)] Update to v2019.01, add imgui feat.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Improve dependencies to corrade

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add faad2audioimporter

 - faad2 is currently not in vcpkg, hence commented out
 - The commented out empty line is required to have vcpkg parse the file
   without issues

Signed-off-by: Squareys <squareys@googlemail.com>
2019-02-11 13:49:12 -08:00
Jonathan Hale
aba5a4abec [corrade/magnum/-extras/-integration/-plugins] Update to 2018.10 (#4556)
Signed-off-by: Squareys <squareys@googlemail.com>
2018-10-25 15:26:05 -07:00
Squareys
eee5939689 [magnum,-plugins,-integration,-extras] Update to v2018.04
Signed-off-by: Squareys <squareys@googlemail.com>
2018-05-02 15:02:39 +02:00
Squareys
3338ab613c [magnum,-plugins] Also install headers for dynamically built plugins
While before there was no use for linking the plugins directly or using
them as libraries in some other way when built dynamically, there now are
intra-dependencies between plugins which to be detected, require the
headers to be installed.

Additionally, the folders lib/magnum and debug/lib/magnum-d are no longer
empty, as we put the plugin deploy scripts there. Removing them is
therefore superfluous.

(Prepares upcoming release/head build)

Signed-off-by: Squareys <squareys@googlemail.com>
2018-05-02 13:42:51 +02:00
Jonathan Hale
3a3fa5cd8f [magnum] Properly deploy plugins (#3191)
* [magnum] Properly deploy magnum plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Add tinygltfimporter feature

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum][magnum-plugins] Add features: trade and any*

Prepares upcoming move of those sublibraries and allows building --head
immediately.
For current release this only adds some unused cmake flags that will be
ignored.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add gl feature, cleanup dependencies, mark upcoming features

And sort features alphabetically.

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum-plugins] Prepare renaming of static flag for --head installs

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Add two missing feature dependencies

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum] Enable magnum[any*] features by default

Signed-off-by: Squareys <squareys@googlemail.com>
2018-04-18 19:33:12 -07:00
Jonathan Hale
0822a28059 [corrade,magnum,-plugins,-extras,-integration] Update to latest and support feature packages (#2687)
[corrade,magnum,-plugins,-extras,-integration] Update to latest and support feature packages
2018-02-16 21:25:30 -08:00
Joel Clay
0e6e2c9658 Update magnum, magnum-plugins and corrade to latest 2018-01-10 20:47:42 -05:00
Alexander Karatarakis
cb239b92c0 Fix several port hashes due to github tar.gz change
It looks like github changed the version (or the generally the way)
they do tars, causing some hash mismatches. This fixes the affected
ports.
2017-09-12 13:32:26 -07:00
sigman
bffa100a43 [magnum][magnum-plugins] Fixed plugins location, static plugins build
Static libray linkage should work now, including plugins.
2017-06-22 13:30:08 +03:00
sigman
7b9275f1b3 [corrade][magnum][magnum-plugins] Updated to upstream, enabled more features in [magnum]
Removed plugin location defines. Fixed tools search path in FindCorrade, FindMagnum cmake modules.
2017-06-15 21:48:51 +03:00
sigman
27db5c14bb [magnum-plugins] Patch for missing include
vs2017 regression
2017-06-10 17:48:40 +03:00
Robert Schumacher
8cbadbffdc [corrade][magnum-plugins][magnum] Use vcpkg_from_github() 2017-06-09 20:38:25 -07:00
sigman
1b76105200 [Magnum-plugins] Import plugins for the magnum opengl library
Added magnum-plugins library with the reasonable defaults and minimal dependencies .
2017-06-09 15:17:01 +03:00