diff options
| author | Marco Poletti <poletti.marco@gmail.com> | 2020-03-09 01:25:42 -0700 |
|---|---|---|
| committer | Marco Poletti <poletti.marco@gmail.com> | 2020-03-09 01:25:42 -0700 |
| commit | fa3726d52c490321f3c0ef10935dce0497e8f83c (patch) | |
| tree | a69e43db0773539c9cf26410ba89bc8be75955be /CONTRIBUTING.md | |
| parent | 0427ec43330720c7f1a7211c60c156527ad0e0d5 (diff) | |
| download | google-fruit-fa3726d52c490321f3c0ef10935dce0497e8f83c.tar.gz | |
Update the Windows instructions in CONTRIBUTING.md to work with MSVC 2019.
Diffstat (limited to 'CONTRIBUTING.md')
| -rw-r--r-- | CONTRIBUTING.md | 46 |
1 files changed, 17 insertions, 29 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8d9170f..83bb23a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -104,37 +104,24 @@ For example, if you installed Boost in `C:\boost\boost_1_62_0`, you can put this // See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file. "configurations": [ { - "name": "x86-Debug", - "generator": "Visual Studio 15 2017", - "configurationType": "Debug", - "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", - "cmakeCommandArgs": "-DBoost_INCLUDE_DIR=C:\\boost\\boost_1_62_0 -DCMAKE_BUILD_TYPE=Debug -DFRUIT_ADDITIONAL_CXX_FLAGS=/Z7", - "buildCommandArgs": "-m -v:minimal" + "name": "x64-Debug", + "generator": "Visual Studio 16 2019 Win64", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "cmakeCommandArgs": "-DBoost_INCLUDE_DIR=C:\\boost\\boost_1_62_0 -DCMAKE_BUILD_TYPE=Debug -DFRUIT_ADDITIONAL_CXX_FLAGS=/Z7", + "buildCommandArgs": "-m -v:minimal", + "intelliSenseMode": "windows-msvc-x64" }, { - "name": "x86-Release", - "generator": "Visual Studio 15 2017", - "configurationType": "Release", - "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", - "cmakeCommandArgs": "-DBoost_INCLUDE_DIR=C:\\boost\\boost_1_62_0 -DCMAKE_BUILD_TYPE=Release", - "buildCommandArgs": "-m -v:minimal" - }, - { - "name": "x64-Debug", - "generator": "Visual Studio 15 2017 Win64", - "configurationType": "Debug", - "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", - "cmakeCommandArgs": "-DBoost_INCLUDE_DIR=C:\\boost\\boost_1_62_0 -DCMAKE_BUILD_TYPE=Debug -DFRUIT_ADDITIONAL_CXX_FLAGS=/Z7", - "buildCommandArgs": "-m -v:minimal" - }, - { - "name": "x64-Release", - "generator": "Visual Studio 15 2017 Win64", - "configurationType": "Release", - "buildRoot": "${env.LOCALAPPDATA}\\CMakeBuild\\${workspaceHash}\\build\\${name}", - "cmakeCommandArgs": "-DBoost_INCLUDE_DIR=C:\\boost\\boost_1_62_0 -DCMAKE_BUILD_TYPE=Release", - "buildCommandArgs": "-m -v:minimal" + "name": "x64-Debug-noboost", + "generator": "Visual Studio 16 2019 Win64", + "configurationType": "Debug", + "buildRoot": "${projectDir}\\out\\build\\${name}", + "cmakeCommandArgs": "-DFRUIT_USES_BOOST=False -DCMAKE_BUILD_TYPE=Debug -DFRUIT_ADDITIONAL_CXX_FLAGS=/Z7", + "buildCommandArgs": "-m -v:minimal", + "intelliSenseMode": "windows-msvc-x64" } + ] } @@ -148,8 +135,9 @@ You can also run tests, but *only* from the command-line (after building Fruit f To do that, you'll need python3 installed (you can download it [here](https://www.python.org/downloads/)). -You'll also the `pytest` and `pytest-xdist` packages. You can install them with: +You'll also some Python packages. You can install them with: + pip install absl-py pip install pytest pip install pytest-xdist |