From 2efbe4ec6f211326c395f2b0a075de2ce07a2d4a Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 28 Oct 2016 18:58:39 -0700 Subject: [vcpkg.targets] Change VCPkg casing to Vcpkg --- scripts/buildsystems/msbuild/vcpkg.targets | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 3a74099f0..0d89fedd3 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -1,56 +1,56 @@ - true - x86-windows + true + x86-windows - true - x86-uwp + true + x86-uwp - true - x64-windows + true + x64-windows - true - x64-uwp + true + x64-uwp - true - arm-uwp + true + arm-uwp - - $(Configuration) + + $(Configuration) - $(MSBuildThisFileDirectory)..\..\..\installed\$(VCPkgTriplet)\ + $(MSBuildThisFileDirectory)..\..\..\installed\$(VcpkgTriplet)\ - + - $(VCPkgRoot)debug\lib\*.lib;%(AdditionalDependencies) - $(VCPkgRoot)lib\*.lib;%(AdditionalDependencies) + $(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies) + $(VcpkgRoot)lib\*.lib;%(AdditionalDependencies) - $(VCPkgRoot)include;%(AdditionalIncludeDirectories) + $(VcpkgRoot)include;%(AdditionalIncludeDirectories) - + - - -- cgit v1.2.3 From d58f0c6680b93833a9a1b653c422ba7d2bb00f5d Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 31 Oct 2016 13:32:58 -0700 Subject: [integration] Enable static lib integration. Also, detect .vcpkg-root --- scripts/buildsystems/msbuild/vcpkg.targets | 94 +++++++++++++++++------------- 1 file changed, 54 insertions(+), 40 deletions(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 0d89fedd3..a7abe5dba 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -1,44 +1,58 @@ - - true - x86-windows - - - - true - x86-uwp - - - - true - x64-windows - - - - true - x64-uwp - - - - true - arm-uwp - - - - $(Configuration) - - $(MSBuildThisFileDirectory)..\..\..\installed\$(VcpkgTriplet)\ - - - - - $(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies) - $(VcpkgRoot)lib\*.lib;%(AdditionalDependencies) - - - $(VcpkgRoot)include;%(AdditionalIncludeDirectories) - - + + + + + + -static + + -static + + + + true + x86-windows$(VcpkgRuntimeLibrary) + + + + + + true + x86-uwp$(VcpkgRuntimeLibrary) + + + + true + x64-windows$(VcpkgRuntimeLibrary) + + + + true + x64-uwp$(VcpkgRuntimeLibrary) + + + + true + arm-uwp$(VcpkgRuntimeLibrary) + + + + $(Configuration) + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\ + + + + + + + $(VcpkgRoot)debug\lib\*.lib;%(Link.AdditionalDependencies) + $(VcpkgRoot)lib\*.lib;%(Link.AdditionalDependencies) + + + $(VcpkgRoot)include;%(ClCompile.AdditionalIncludeDirectories) + + + Date: Mon, 31 Oct 2016 17:02:39 -0700 Subject: Fix issues with the integration file --- scripts/buildsystems/msbuild/vcpkg.targets | 30 +++++++++++++++++++++++++----- 1 file changed, 25 insertions(+), 5 deletions(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index a7abe5dba..e6a321ffd 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -1,6 +1,6 @@ - + @@ -44,16 +44,36 @@ - - $(VcpkgRoot)debug\lib\*.lib;%(Link.AdditionalDependencies) - $(VcpkgRoot)lib\*.lib;%(Link.AdditionalDependencies) - $(VcpkgRoot)include;%(ClCompile.AdditionalIncludeDirectories) + + + + + + + + @(VcpkgLink);%(Link.AdditionalDependencies) + + + + + + + $(ComputeLinkInputsTargets);VcpkgLinkInputs + + Date: Fri, 4 Nov 2016 17:37:58 -0700 Subject: Revert d58f0c6680. MSBuild (and CMake) do not allow switching on CRT type effectively, so we should use more robust logic. --- scripts/buildsystems/msbuild/vcpkg.targets | 101 ++++++++++------------------- 1 file changed, 33 insertions(+), 68 deletions(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index e6a321ffd..18c4e9d9f 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -1,79 +1,44 @@ + + true + x86-windows + - - - - - -static - - -static - - - - true - x86-windows$(VcpkgRuntimeLibrary) - - - - - - true - x86-uwp$(VcpkgRuntimeLibrary) - - - - true - x64-windows$(VcpkgRuntimeLibrary) - - - - true - x64-uwp$(VcpkgRuntimeLibrary) - - - - true - arm-uwp$(VcpkgRuntimeLibrary) - - - - $(Configuration) - $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\ - + + true + x86-uwp + - - - - - $(VcpkgRoot)include;%(ClCompile.AdditionalIncludeDirectories) - - - + + true + x64-windows + - - - - - + + true + x64-uwp + - - @(VcpkgLink);%(Link.AdditionalDependencies) - - - - + + true + arm-uwp + - - $(ComputeLinkInputsTargets);VcpkgLinkInputs + + $(Configuration) + $([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), .vcpkg-root))\installed\$(VcpkgTriplet)\ + + + $(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies) + $(VcpkgRoot)lib\*.lib;%(AdditionalDependencies) + + + $(VcpkgRoot)include;%(AdditionalIncludeDirectories) + + + Date: Tue, 8 Nov 2016 19:02:59 -0800 Subject: Use /DEPENDENTS instead of /IMPORTS in applocal.ps1 --- scripts/buildsystems/msbuild/applocal.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 70528e078..ddb4a07f9 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -5,7 +5,7 @@ function resolve($targetBinary) { $targetBinaryPath = Resolve-Path $targetBinary $targetBinaryDir = Split-Path $targetBinaryPath -parent - $a = $(link /dump /imports $targetBinary | ? { $_ -match "^ [^ ].*\.dll" } | % { $_ -replace "^ ","" }) + $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^ [^ ].*\.dll" } | % { $_ -replace "^ ","" }) $a | % { if (Test-Path "$installedDir\$_") { if (Test-Path "$targetBinaryDir\$_") { -- cgit v1.2.3 From 32157f8ce5abdca2f25981064006906cd1cce5e5 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 25 Nov 2016 23:10:27 -0800 Subject: [vcpkg-integrate] Provide an opt-out for autolinking. Properly suppress integration via MSBuild when using CMake. Add lib\ and lib\manual-link\ to additional library paths. [gtest] Because the four libraries provided by gtest supply redundant symbols and define main, opt them all out. Addresses #306. --- scripts/buildsystems/msbuild/vcpkg.targets | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 18c4e9d9f..7782551c2 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -31,11 +31,13 @@ - $(VcpkgRoot)debug\lib\*.lib;%(AdditionalDependencies) - $(VcpkgRoot)lib\*.lib;%(AdditionalDependencies) + %(AdditionalDependencies);$(VcpkgRoot)debug\lib\*.lib + %(AdditionalDependencies);$(VcpkgRoot)lib\*.lib + %(AdditionalLibraryDirectories);$(VcpkgRoot)lib;$(VcpkgRoot)lib\manual-link + %(AdditionalLibraryDirectories);$(VcpkgRoot)debug\lib;$(VcpkgRoot)debug\lib\manual-link - $(VcpkgRoot)include;%(AdditionalIncludeDirectories) + %(AdditionalIncludeDirectories);$(VcpkgRoot)include -- cgit v1.2.3 From c0cb3ca00997207be8896475667bdca19938c925 Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Fri, 23 Dec 2016 11:14:17 +0100 Subject: Copy DLLs for all project types. $(TargetPath) is a simpler way of getting the primary output than assembling it from multiple variables. In addition, $(OutputType) matches $(TargetExt) only for .exe projects. --- scripts/buildsystems/msbuild/vcpkg.targets | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 7782551c2..ddae84806 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -41,17 +41,17 @@ - + -- cgit v1.2.3 From 335c15a9d05f6410d3df6133ffc60b04fdfbe20f Mon Sep 17 00:00:00 2001 From: Christian Ullrich Date: Fri, 23 Dec 2016 14:45:29 +0100 Subject: Copy DLLs before attempting to regsvr32. --- scripts/buildsystems/msbuild/vcpkg.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index ddae84806..0c748c1d6 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -41,7 +41,7 @@ - + -- cgit v1.2.3 From da09df713fe7b68d432108802447eb534a7dd555 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Fri, 13 Jan 2017 17:39:12 -0800 Subject: [vcpkg integration] Explicitly skip empty entries instead of recursing. Fixes #460. --- scripts/buildsystems/msbuild/applocal.ps1 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index ddb4a07f9..46981fad5 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -7,6 +7,9 @@ function resolve($targetBinary) { $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^ [^ ].*\.dll" } | % { $_ -replace "^ ","" }) $a | % { + if ([string]::IsNullOrEmpty($_)) { + continue + } if (Test-Path "$installedDir\$_") { if (Test-Path "$targetBinaryDir\$_") { Write-Verbose "$_ is already present" -- cgit v1.2.3 From 030ed271179ac57479d4bfec2e64b9457486d4c5 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Thu, 19 Jan 2017 17:38:56 -0800 Subject: Fix integration when $(Platform) is empty --- scripts/buildsystems/msbuild/vcpkg.targets | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 0c748c1d6..912cf6b8e 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -9,6 +9,16 @@ x86-uwp + + true + x86-windows + + + + true + x86-uwp + + true x64-windows -- cgit v1.2.3 From 44810f267d095986f519d8b41592e83e913c2e56 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 23 Jan 2017 18:26:57 -0800 Subject: [vcpkg integrate] Lower verbosity of MSBuild messages. --- scripts/buildsystems/msbuild/vcpkg.targets | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 912cf6b8e..26a524ca3 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -57,12 +57,14 @@ Lines="^$(OutputPath)$(TargetName).$(OutputType);" Encoding="Unicode"/> + ConsoleToMSBuild="true" + StandardOutputImportance="Normal"> + ConsoleToMSBuild="true" + StandardOutputImportance="Normal"> -- cgit v1.2.3 From 33ce94a4565ce68cd02cacda221fccbd756d3949 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 24 Jan 2017 15:17:45 -0800 Subject: [vcpkg integrate] Exit silently if target cannot be found. --- scripts/buildsystems/msbuild/applocal.ps1 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 46981fad5..55680c1f6 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -2,7 +2,14 @@ param([string]$targetBinary, [string]$installedDir, [string]$tlogFile) function resolve($targetBinary) { - $targetBinaryPath = Resolve-Path $targetBinary + try + { + $targetBinaryPath = Resolve-Path $targetBinary -erroraction stop + } + catch [System.Management.Automation.ItemNotFoundException] + { + return + } $targetBinaryDir = Split-Path $targetBinaryPath -parent $a = $(dumpbin /DEPENDENTS $targetBinary | ? { $_ -match "^ [^ ].*\.dll" } | % { $_ -replace "^ ","" }) -- cgit v1.2.3 From 8b219333675e42edf21f6c528fe7760d6d465460 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 31 Jan 2017 17:53:08 -0800 Subject: [vcpkg-msbuild] Add troubleshooting message to MSBuild projects with Importance=Normal --- scripts/buildsystems/msbuild/vcpkg.targets | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'scripts/buildsystems/msbuild') diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 26a524ca3..d1d804e94 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -51,6 +51,11 @@ + + + + +