2018-02-27 10:18:05 +08:00
|
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
|
|
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
|
|
|
|
|
<ItemGroup Label="ProjectConfigurations">
|
|
|
|
|
|
<ProjectConfiguration Include="Debug|Win32">
|
|
|
|
|
|
<Configuration>Debug</Configuration>
|
|
|
|
|
|
<Platform>Win32</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Release|Win32">
|
|
|
|
|
|
<Configuration>Release</Configuration>
|
|
|
|
|
|
<Platform>Win32</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Debug|x64">
|
|
|
|
|
|
<Configuration>Debug</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
<ProjectConfiguration Include="Release|x64">
|
|
|
|
|
|
<Configuration>Release</Configuration>
|
|
|
|
|
|
<Platform>x64</Platform>
|
|
|
|
|
|
</ProjectConfiguration>
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
2019-07-27 07:32:33 +08:00
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\arguments.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\catch.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\chrono.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\dependencies.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\files.cpp" />
|
2020-02-04 06:22:52 +08:00
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\mockcmakevarsprovider.cpp" />
|
2019-07-27 07:32:33 +08:00
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\paragraph.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\plan.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\specifier.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\statusparagraphs.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\strings.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\update.cpp" />
|
|
|
|
|
|
<ClCompile Include="..\src\vcpkg-test\util.cpp" />
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
|
|
|
|
|
<ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">
|
|
|
|
|
|
<Project>{b98c92b7-2874-4537-9d46-d14e5c237f04}</Project>
|
|
|
|
|
|
</ProjectReference>
|
|
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<ItemGroup>
|
2020-02-04 06:22:52 +08:00
|
|
|
|
<ClInclude Include="..\include\catch2\catch.hpp" />
|
|
|
|
|
|
<ClInclude Include="..\include\vcpkg-test\mockcmakevarprovider.h" />
|
2019-07-27 07:32:33 +08:00
|
|
|
|
<ClInclude Include="..\include\vcpkg-test\util.h" />
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</ItemGroup>
|
|
|
|
|
|
<PropertyGroup Label="Globals">
|
|
|
|
|
|
<ProjectGuid>{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}</ProjectGuid>
|
|
|
|
|
|
<Keyword>Win32Proj</Keyword>
|
|
|
|
|
|
<RootNamespace>vcpkgtest</RootNamespace>
|
2019-07-20 14:20:28 +08:00
|
|
|
|
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
|
|
|
|
|
|
<PlatformToolset>v140</PlatformToolset>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
2020-02-04 06:22:52 +08:00
|
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
|
|
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
|
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
2020-02-04 06:22:52 +08:00
|
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<UseDebugLibraries>false</UseDebugLibraries>
|
|
|
|
|
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
|
|
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
|
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
2019-07-19 10:07:00 +08:00
|
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
|
|
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
|
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
2020-02-04 06:22:52 +08:00
|
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<UseDebugLibraries>false</UseDebugLibraries>
|
|
|
|
|
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
|
|
|
|
|
<CharacterSet>Unicode</CharacterSet>
|
|
|
|
|
|
<UseOfMfc>false</UseOfMfc>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
|
|
|
|
<ImportGroup Label="ExtensionSettings">
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<ImportGroup Label="Shared">
|
|
|
|
|
|
</ImportGroup>
|
|
|
|
|
|
<PropertyGroup Label="UserMacros" />
|
2019-07-12 09:16:10 +08:00
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
2018-10-31 07:40:38 +08:00
|
|
|
|
<IntDir>$(SolutionDir)msbuild.x86.debug\$(ProjectName)\</IntDir>
|
|
|
|
|
|
<OutDir>$(SolutionDir)msbuild.x86.debug\</OutDir>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
|
|
|
<OutDir>$(SolutionDir)msbuild.x86.release\</OutDir>
|
|
|
|
|
|
<IntDir>$(SolutionDir)msbuild.x86.release\$(ProjectName)\</IntDir>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
|
|
|
<IntDir>$(SolutionDir)msbuild.x64.debug\$(ProjectName)\</IntDir>
|
|
|
|
|
|
<OutDir>$(SolutionDir)msbuild.x64.debug\</OutDir>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
|
|
|
<IntDir>$(SolutionDir)msbuild.x64.release\$(ProjectName)\</IntDir>
|
|
|
|
|
|
<OutDir>$(SolutionDir)msbuild.x64.release\</OutDir>
|
|
|
|
|
|
</PropertyGroup>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
|
|
|
<LinkIncremental>true</LinkIncremental>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
|
|
|
<LinkIncremental>true</LinkIncremental>
|
|
|
|
|
|
</PropertyGroup>
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
|
|
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
|
|
|
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
|
|
|
<ClCompile>
|
[vcpkg] Clean up CMake build system (#10834)
There are quite a few changes to the CMake build system packaged up into
one set here:
* Added `toolsrc/cmake/utilities.cmake`, which contains the following:
* `vcpkg_detect_compiler` -- get the name of the C++ compiler, as one
of {gcc, clang, msvc}
* `vcpkg_detect_standard_library` -- get the name of the standard
library we're linking to, as one of {libstdc++, libc++, msvc-stl}
* `vcpkg_detect_std_filesystem` -- figure out how to link and call
into C++17's filesystem; whether one needs to link to `stdc++fs` or
`c++fs`, and whether to use `<filesystem>` or
`<experimental/filesystem>`.
* Added a `VCPKG_WARNINGS_AS_ERRORS`, split off from
`VCPKG_DEVELOPMENT_WARNINGS`, which allows one to use the development
warnings without passing -Werror
* Rename `DEFINE_DISABLE_METRICS` to `VCPKG_DISABLE_METRICS` -- the
former will now print a deprecation message and set the latter.
* Now, print a deprecation message on `WERROR`; it doesn't do anything
since the behavior it requested is now the default.
* Pass `-std=c++17` if the compiler allows it, instead of `-std=c++1z`
* Do some code movement
* Pass `USE_STD_FILESYSTEM` if possible, instead of only on minGW
* Renamed to `VCPKG_USE_STD_FILESYSTEM`
Additionally, we now pass `/W4` in Debug mode on x86 in the Visual
Studio build system; this brings it in line with the CMake build system,
and the x64 Visual Studio build system.
And finally, we make some minor code changes to support compiling in
VCPKG_DEVELOPMENT_WARNINGS mode.
2020-04-15 13:08:50 +08:00
|
|
|
|
<WarningLevel>Level4</WarningLevel>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<Optimization>Disabled</Optimization>
|
|
|
|
|
|
<AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
|
|
|
<PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
|
|
|
<UseFullPaths>true</UseFullPaths>
|
|
|
|
|
|
<AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
|
|
|
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
|
|
|
<MinimalRebuild>false</MinimalRebuild>
|
|
|
|
|
|
</ClCompile>
|
|
|
|
|
|
<Link>
|
2019-07-19 10:07:00 +08:00
|
|
|
|
<SubSystem>Console</SubSystem>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
2018-03-17 07:53:48 +08:00
|
|
|
|
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</Link>
|
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
|
|
|
<ClCompile>
|
|
|
|
|
|
<WarningLevel>Level4</WarningLevel>
|
|
|
|
|
|
<Optimization>Disabled</Optimization>
|
|
|
|
|
|
<AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
|
|
|
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
|
|
|
<UseFullPaths>true</UseFullPaths>
|
|
|
|
|
|
<AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
|
|
|
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
|
|
|
|
|
<MinimalRebuild>false</MinimalRebuild>
|
|
|
|
|
|
</ClCompile>
|
|
|
|
|
|
<Link>
|
2019-07-19 10:07:00 +08:00
|
|
|
|
<SubSystem>Console</SubSystem>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
2018-03-17 07:53:48 +08:00
|
|
|
|
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</Link>
|
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
|
|
|
<ClCompile>
|
|
|
|
|
|
<WarningLevel>Level3</WarningLevel>
|
|
|
|
|
|
<Optimization>MaxSpeed</Optimization>
|
|
|
|
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
|
|
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
|
|
|
|
<AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
|
|
|
<PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
|
|
|
<UseFullPaths>true</UseFullPaths>
|
|
|
|
|
|
<AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
|
|
|
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
2020-02-04 06:22:52 +08:00
|
|
|
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</ClCompile>
|
|
|
|
|
|
<Link>
|
2019-07-19 10:07:00 +08:00
|
|
|
|
<SubSystem>Console</SubSystem>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
|
|
|
<OptimizeReferences>true</OptimizeReferences>
|
|
|
|
|
|
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
2018-03-17 07:53:48 +08:00
|
|
|
|
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</Link>
|
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
|
|
|
<ClCompile>
|
|
|
|
|
|
<WarningLevel>Level3</WarningLevel>
|
|
|
|
|
|
<Optimization>MaxSpeed</Optimization>
|
|
|
|
|
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
|
|
|
|
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
|
|
|
|
|
<AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
|
|
|
|
|
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
|
|
|
|
|
<UseFullPaths>true</UseFullPaths>
|
|
|
|
|
|
<AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>
|
|
|
|
|
|
<MultiProcessorCompilation>true</MultiProcessorCompilation>
|
2020-02-04 06:22:52 +08:00
|
|
|
|
<WholeProgramOptimization>false</WholeProgramOptimization>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</ClCompile>
|
|
|
|
|
|
<Link>
|
2019-07-19 10:07:00 +08:00
|
|
|
|
<SubSystem>Console</SubSystem>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
|
|
|
<OptimizeReferences>true</OptimizeReferences>
|
|
|
|
|
|
<AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
2018-03-17 07:53:48 +08:00
|
|
|
|
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
2018-02-27 10:18:05 +08:00
|
|
|
|
</Link>
|
|
|
|
|
|
</ItemDefinitionGroup>
|
|
|
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
|
|
|
|
<ImportGroup Label="ExtensionTargets">
|
|
|
|
|
|
</ImportGroup>
|
[vcpkg] Clean up CMake build system (#10834)
There are quite a few changes to the CMake build system packaged up into
one set here:
* Added `toolsrc/cmake/utilities.cmake`, which contains the following:
* `vcpkg_detect_compiler` -- get the name of the C++ compiler, as one
of {gcc, clang, msvc}
* `vcpkg_detect_standard_library` -- get the name of the standard
library we're linking to, as one of {libstdc++, libc++, msvc-stl}
* `vcpkg_detect_std_filesystem` -- figure out how to link and call
into C++17's filesystem; whether one needs to link to `stdc++fs` or
`c++fs`, and whether to use `<filesystem>` or
`<experimental/filesystem>`.
* Added a `VCPKG_WARNINGS_AS_ERRORS`, split off from
`VCPKG_DEVELOPMENT_WARNINGS`, which allows one to use the development
warnings without passing -Werror
* Rename `DEFINE_DISABLE_METRICS` to `VCPKG_DISABLE_METRICS` -- the
former will now print a deprecation message and set the latter.
* Now, print a deprecation message on `WERROR`; it doesn't do anything
since the behavior it requested is now the default.
* Pass `-std=c++17` if the compiler allows it, instead of `-std=c++1z`
* Do some code movement
* Pass `USE_STD_FILESYSTEM` if possible, instead of only on minGW
* Renamed to `VCPKG_USE_STD_FILESYSTEM`
Additionally, we now pass `/W4` in Debug mode on x86 in the Visual
Studio build system; this brings it in line with the CMake build system,
and the x64 Visual Studio build system.
And finally, we make some minor code changes to support compiling in
VCPKG_DEVELOPMENT_WARNINGS mode.
2020-04-15 13:08:50 +08:00
|
|
|
|
</Project>
|