diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-25 19:07:18 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-01-25 19:07:18 -0800 |
| commit | a026f0d10c86352a97c4db2f66a0ba5627b2fe17 (patch) | |
| tree | 8f13ed929b0007edc55526329f4f0e96f1aaddea /toolsrc/vcpkglib | |
| parent | 8b602f97c83613862837d842263a17850828e953 (diff) | |
| download | vcpkg-a026f0d10c86352a97c4db2f66a0ba5627b2fe17.tar.gz vcpkg-a026f0d10c86352a97c4db2f66a0ba5627b2fe17.zip | |
Remove vcpkgmetrics.vcxproj. Merge it into vcpkglib.vcxproj
Diffstat (limited to 'toolsrc/vcpkglib')
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj | 13 | ||||
| -rw-r--r-- | toolsrc/vcpkglib/vcpkglib.vcxproj.filters | 6 |
2 files changed, 15 insertions, 4 deletions
diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj b/toolsrc/vcpkglib/vcpkglib.vcxproj index 561b22477..eefc43c26 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj @@ -47,6 +47,9 @@ <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>MultiByte</CharacterSet> </PropertyGroup> +<PropertyGroup> + <DISABLE_METRICS Condition="'$(DISABLE_METRICS)' == ''">0</DISABLE_METRICS> + </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> @@ -72,7 +75,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions> </ClCompile> </ItemDefinitionGroup> @@ -82,7 +85,7 @@ <Optimization>Disabled</Optimization> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions> </ClCompile> </ItemDefinitionGroup> @@ -94,7 +97,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> @@ -110,7 +113,7 @@ <IntrinsicFunctions>true</IntrinsicFunctions> <SDLCheck>true</SDLCheck> <AdditionalIncludeDirectories>..\include</AdditionalIncludeDirectories> - <PreprocessorDefinitions>VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>DISABLE_METRICS=$(DISABLE_METRICS);VCPKG_VERSION=$(VCPKG_VERSION);_MBCS;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions> </ClCompile> <Link> @@ -121,6 +124,7 @@ <ItemGroup> <ClInclude Include="..\include\BinaryParagraph.h" /> <ClInclude Include="..\include\BuildInfo.h" /> + <ClInclude Include="..\include\metrics.h" /> <ClInclude Include="..\include\package_spec.h" /> <ClInclude Include="..\include\package_spec_parse_result.h" /> <ClInclude Include="..\include\Paragraphs.h" /> @@ -136,6 +140,7 @@ <ItemGroup> <ClCompile Include="..\src\BinaryParagraph.cpp" /> <ClCompile Include="..\src\BuildInfo.cpp" /> + <ClCompile Include="..\src\metrics.cpp" /> <ClCompile Include="..\src\vcpkg.cpp" /> <ClCompile Include="..\src\package_spec.cpp" /> <ClCompile Include="..\src\package_spec_parse_result.cpp" /> diff --git a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters index e8856235c..9b7a3779f 100644 --- a/toolsrc/vcpkglib/vcpkglib.vcxproj.filters +++ b/toolsrc/vcpkglib/vcpkglib.vcxproj.filters @@ -54,6 +54,9 @@ <ClCompile Include="..\src\BuildInfo.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\src\metrics.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\include\vcpkg.h"> @@ -95,5 +98,8 @@ <ClInclude Include="..\include\BuildInfo.h"> <Filter>Header Files</Filter> </ClInclude> + <ClInclude Include="..\include\metrics.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file |