diff options
| author | Thomas Fussell <thomas.fussell@gmail.com> | 2017-01-01 18:28:56 -0500 |
|---|---|---|
| committer | Thomas Fussell <thomas.fussell@gmail.com> | 2017-01-01 18:28:56 -0500 |
| commit | 32dd084deadecd726172b85239c30bbbf683f62b (patch) | |
| tree | 492044fa3bce12e930d6c565d92095d71fac68e5 /scripts/buildsystems | |
| parent | 937c246ac2aa6ec11a02d0cb36a4e50919842c8a (diff) | |
| parent | bc8cca82a297e37bf9dde387991c1d51618273b7 (diff) | |
| download | vcpkg-32dd084deadecd726172b85239c30bbbf683f62b.tar.gz vcpkg-32dd084deadecd726172b85239c30bbbf683f62b.zip | |
Merge branch 'master' of http://github.com/Microsoft/vcpkg
Diffstat (limited to 'scripts/buildsystems')
| -rw-r--r-- | scripts/buildsystems/msbuild/vcpkg.targets | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 7782551c2..0c748c1d6 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -41,17 +41,17 @@ </ClCompile> </ItemDefinitionGroup> - <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup" Condition="'$(VcpkgEnabled)' == 'true' and '$(OutputType)' == 'exe'"> + <Target Name="AppLocalFromInstalled" AfterTargets="CopyFilesToOutputDirectory" BeforeTargets="CopyLocalFilesOutputGroup;RegisterOutput" Condition="'$(VcpkgEnabled)' == 'true'"> <WriteLinesToFile File="$(TLogLocation)$(ProjectName).write.1u.tlog" Lines="^$(OutputPath)$(TargetName).$(OutputType);" Encoding="Unicode"/> <Exec Condition="'$(VcpkgConfiguration)' == 'Debug'" - Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VcpkgRoot)debug\bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22" + Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(TargetPath)%22 %22$(VcpkgRoot)debug\bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22" ConsoleToMSBuild="true"> <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" /> </Exec> <Exec Condition="'$(VcpkgConfiguration)' == 'Release'" - Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(OutputPath)$(TargetName).$(OutputType)%22 %22$(VcpkgRoot)bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22" + Command="powershell.exe -ExecutionPolicy Unrestricted -noprofile -File %22$(MSBuildThisFileDirectory)applocal.ps1%22 %22$(TargetPath)%22 %22$(VcpkgRoot)bin%22 %22$(TLogLocation)$(ProjectName).write.1u.tlog%22" ConsoleToMSBuild="true"> <Output TaskParameter="ConsoleOutput" ItemName="ReferenceCopyLocalPaths" /> </Exec> |