Commit Graph

30 Commits

Author SHA1 Message Date
LilyWangLL
2e18a52428
[magnum] Fix feature glfwapplication find glfw failed (#22272)
* [magnum] Fix feature glfwapplication find glfw failed

* update version

* update portfile.cmake

* update version

* update portfile.cmake

* update version

* update version

* update version

* More double quotes

* version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
2022-01-03 13:24:17 -08:00
pezcode
9df0b27226
[magnum] Move static debug libraries to root lib/ folder (#21328)
* [magnum] Move static debug libraries to root lib/ folder

* [magnum] Replace deprecated functions

* [magnum] Update version
2021-11-23 12:06:57 -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
Phoebe
9032255d41
[magnum] Removing quotes around tools list where vcpkg_copy_tools is involked (#14383) 2020-11-05 12:44:30 -08: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
Jack·Boos·Yu
f23ebed76f
[cmake] Update to 3.17.2 (#10767)
* [cmake] Update to 3.17.1

* update cmake directory name

* [cpuid] Fix install headers.

* [stormlib] Fix install headers

* [murmurhash] Fix install headers

* [metrohash] Fix install headers

* update baseline

* update baseline

* [otl] update hash

* update baseline

* [gts] Do not use ninja to avoid empty implib issue

* update baseline

* [dmlc] Re-trigger ci test

* [replxx] Re-trigger ci test

* update baseline

* [osg] Re-trigger ci test

* [replxx] Fix build failure

* Set cmake min version to 3.17.1

* update baseline

* [libnice] Re-trigger ci test

* [mlpack] Re-trigger ci test

* update to 3.17.2

* update cmake hash

* update baseline

* update baseline

* update baseline

* update baseline

* Update scripts/ci.baseline.txt

Co-authored-by: Billy O'Neal <billy.oneal@gmail.com>

* update baseline

* update baseline

* [magnum] Set magnum:arm64-windows to skip in baseline

* [nanogui] Set nanogui:arm64-windows to fail in baseline

* [nettle] Set nettle:x64-windows to fail, waiting for fix this issue in another PR

* re-trigger CI test

* update baseline

* Install unixODBC in Linux

* [nanodbc] Re-trigger CI test

* update baseline

* Remove space

* update baseline
2020-05-19 14:47:19 -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
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
6f7ef0f142 magnum: Fix KHR/khrplatform.h not found on vcpkg in VS (#7926)
Signed-off-by: Squareys <squareys@googlemail.com>
2019-08-27 14:07:28 -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
lecopivo
7c4e262e50 Corrade and Magnum on Linux (#3611)
* Corrade and Magnum on Linux

Removed ".exe" extension for executables on Linux.
Removed default feature magnum[windowlesswglapplication] which works
only on Windows.

* Switched to CMAKE_EXECUTABLE_SUFFIX

* [corrade] Remove use of CMAKE_EXECUTABLE_SUFFIX

* [magnum] Avoid usages of CMAKE_EXECUTABLE_SUFFIX
2018-07-04 07:12:51 -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
Robert Schumacher
47e968937f [magnum] Remove --trace 2017-12-19 10:41:42 -08: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
sigman78
4167807f09 [magnum] Emit plugin binary path to the header
Drop-in solution for the msbuild users.
2017-06-13 15:20:29 +03:00
sigman78
61dbead6fc [magnum] Patch SDL2 includes, msbuild compatibility
Concerning SDL2 includes and how do they work. It is seems what the common practice is to append 'SDL2' include path to the compiler options and then do plain #include "SDL.h". While it works in cmake based projects it won't pass in msbuild ones. This patch changes #include to 'global' style <SDL2/SDL.h> and solves the problem.
2017-06-13 12:35:54 +03:00
Robert Schumacher
8cbadbffdc [corrade][magnum-plugins][magnum] Use vcpkg_from_github() 2017-06-09 20:38:25 -07:00
sigman
741caef3fb [Magnum][Corrade] Cleanup and Audio support
Enabled audio support in magnum by default via openal-soft dependency.
2017-06-09 15:09:05 +03:00
sigman
f0605ca60a [Magnum] Fix static library build
Fixes cmake scripts to build a static version of the libraries.
2017-06-08 02:48:04 +03:00
sigman
1831ce4bcc Magnum OpengGL 3d library port
Added ports to support Magnum C++ OpenGL engine http://mosra.cz/blog/magnum.php and its direct dependencies
2017-06-07 22:10:27 +03:00