Commit fbb46489 authored by Tarasenko Alexander's avatar Tarasenko Alexander

kdlibtest build fix

parent b1f18560
......@@ -179,9 +179,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="packages.kdlibtest_vc120.config">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\include\test\testvars.h" />
......@@ -228,24 +225,25 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\source\kdlib.vcxproj">
<Project>{3e9c538f-f060-4e86-ab7d-d44439615b63}</Project>
</ProjectReference>
<ProjectReference Include="..\..\source\kdlib_vc120.vcxproj">
<Project>{3e9c538f-f060-4e86-ab7d-d44439615b63}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Import Project="$(SolutionDir)\packages\boost.1.57.0.0\build\native\boost.targets" Condition="Exists('$(SolutionDir)\packages\boost.1.57.0.0\build\native\boost.targets')" />
<Import Project="$(SolutionDir)\packages\llvm-cmake.3.9.0.1\build\native\llvm-cmake.targets" Condition="Exists('$(SolutionDir)\packages\llvm-cmake.3.9.0.1\build\native\llvm-cmake.targets')" />
<Import Project="$(SolutionDir)\packages\clang-cmake.3.9.0.1\build\native\clang-cmake.targets" Condition="Exists('$(SolutionDir)\packages\clang-cmake.3.9.0.1\build\native\clang-cmake.targets')" />
<Import Project="$(SolutionDir)\packages\llvm-cmake.6.0.0.1\build\native\llvm-cmake.targets" Condition="Exists('$(SolutionDir)\packages\llvm-cmake.6.0.0.1\build\native\llvm-cmake.targets')" />
<Import Project="$(SolutionDir)\packages\clang-cmake.6.0.0.1\build\native\clang-cmake.targets" Condition="Exists('$(SolutionDir)\packages\clang-cmake.6.0.0.1\build\native\clang-cmake.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\boost.1.57.0.0\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\boost.1.57.0.0\build\native\boost.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\llvm-cmake.3.9.0.1\build\native\llvm-cmake.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\llvm-cmake.3.9.0.1\build\native\llvm-cmake.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\clang-cmake.3.9.0.1\build\native\clang-cmake.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\clang-cmake.3.9.0.1\build\native\clang-cmake.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\llvm-cmake.6.0.0.1\build\native\llvm-cmake.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\llvm-cmake.6.0.0.1\build\native\llvm-cmake.targets'))" />
<Error Condition="!Exists('$(SolutionDir)\packages\clang-cmake.6.0.0.1\build\native\clang-cmake.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\packages\clang-cmake.6.0.0.1\build\native\clang-cmake.targets'))" />
</Target>
</Project>
\ No newline at end of file
......@@ -85,7 +85,6 @@
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="packages.kdlibtest_vc120.config" />
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
......
......@@ -2,6 +2,6 @@
<packages>
<package id="boost" version="1.57.0.0" targetFramework="Native" />
<package id="clang-cmake" version="3.9.0.1" targetFramework="Native" />
<package id="llvm-cmake" version="3.9.0.1" targetFramework="Native" />
<package id="clang-cmake" version="6.0.0.1" targetFramework="Native" />
<package id="llvm-cmake" version="6.0.0.1" targetFramework="Native" />
</packages>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment