diff options
| author | Jonathan Hale <Squareys@googlemail.com> | 2018-04-19 04:33:12 +0200 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-04-18 19:33:12 -0700 |
| commit | 3a3fa5cd8f02dde78b00c12273b338e293edcd51 (patch) | |
| tree | 68ed6e05289fbfb2ffa9393777cd946b039d776c /scripts/buildsystems | |
| parent | 08438e581c3818932f5bc66c744b4d49b2734b62 (diff) | |
| download | vcpkg-3a3fa5cd8f02dde78b00c12273b338e293edcd51.tar.gz vcpkg-3a3fa5cd8f02dde78b00c12273b338e293edcd51.zip | |
[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>
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/msbuild/applocal.ps1 | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 3f0f2ef37..e5f3c3dd0 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -4,6 +4,7 @@ param([string]$targetBinary, [string]$installedDir, [string]$tlogFile, [string]$ $g_searched = @{} # Note: installedDir is actually the bin\ directory. $g_install_root = Split-Path $installedDir -parent +$g_is_debug = $g_install_root -match '(.*\\)?debug(\\)?$' # Ensure we create the copied files log, even if we don't end up copying any files if ($copiedFilesLog) @@ -63,6 +64,13 @@ function resolve([string]$targetBinary) { deployBinary $baseTargetBinaryDir $installedDir "$_" if (Test-Path function:\deployPluginsIfQt) { deployPluginsIfQt $targetBinaryDir "$g_install_root\plugins" "$_" } if (Test-Path function:\deployOpenNI2) { deployOpenNI2 $targetBinaryDir "$g_install_root" "$_" } + if (Test-Path function:\deployPluginsIfMagnum) { + if ($g_is_debug) { + deployPluginsIfMagnum $targetBinaryDir "$g_install_root\bin\magnum-d" "$_" + } else { + deployPluginsIfMagnum $targetBinaryDir "$g_install_root\bin\magnum" "$_" + } + } resolve "$baseTargetBinaryDir\$_" } elseif (Test-Path "$targetBinaryDir\$_") { Write-Verbose " ${_}: $_ not found in vcpkg; locally deployed" @@ -85,5 +93,12 @@ if (Test-Path "$g_install_root\bin\OpenNI2\openni2deploy.ps1") { . "$g_install_root\bin\OpenNI2\openni2deploy.ps1" } +# Note: This is a hack to make Magnum work. +if (Test-Path "$g_install_root\bin\magnum\magnumdeploy.ps1") { + . "$g_install_root\bin\magnum\magnumdeploy.ps1" +} elseif (Test-Path "$g_install_root\bin\magnum-d\magnumdeploy.ps1") { + . "$g_install_root\bin\magnum-d\magnumdeploy.ps1" +} + resolve($targetBinary) -Write-Verbose $($g_searched | out-string)
\ No newline at end of file +Write-Verbose $($g_searched | out-string) |
