diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-05 01:02:15 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2016-11-05 01:02:15 -0700 |
| commit | 7f336c746776daf2af95914ed25ff3d50a96b387 (patch) | |
| tree | 2251824d5db437212c34dd80229e8241964dd774 /toolsrc/vcpkgtest | |
| parent | e5152851f2bb070eb4bcc2b8968d40d48226b04e (diff) | |
| download | vcpkg-7f336c746776daf2af95914ed25ff3d50a96b387.tar.gz vcpkg-7f336c746776daf2af95914ed25ff3d50a96b387.zip | |
Enable qualified dependencies. Fix bug in internal 'build' command.
Added capability for CONTROL files to specify qualified dependencies, which are substring searched inside triplet names.
Fixed bug in internal 'build' command where if a package is already built, that built package's dependencies will be used to determine requirements for the build instead of the port directory's CONTROL file.
Diffstat (limited to 'toolsrc/vcpkgtest')
| -rw-r--r-- | toolsrc/vcpkgtest/vcpkgtest.vcxproj | 5 | ||||
| -rw-r--r-- | toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters | 5 |
2 files changed, 7 insertions, 3 deletions
diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj index 3d9503374..d14f86745 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj @@ -19,7 +19,8 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClCompile Include="..\src\test.cpp" /> + <ClCompile Include="..\src\tests_dependencies.cpp" /> + <ClCompile Include="..\src\tests_paragraph.cpp" /> </ItemGroup> <ItemGroup> <ProjectReference Include="..\vcpkgcommon\vcpkgcommon.vcxproj"> @@ -116,7 +117,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <UseFullPaths>true</UseFullPaths> <PrecompiledHeaderFile /> diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters index 9db7e6ef8..bbbc6bd40 100644 --- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters +++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters @@ -15,7 +15,10 @@ </Filter> </ItemGroup> <ItemGroup> - <ClCompile Include="..\src\test.cpp"> + <ClCompile Include="..\src\tests_paragraph.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\src\tests_dependencies.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> |