diff --git a/CMakeSettings.json b/CMakeSettings.json index f5c1dfff5c1..12b274f1b4b 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -5,6 +5,7 @@ "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", @@ -17,6 +18,7 @@ "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", @@ -29,6 +31,7 @@ "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", @@ -41,6 +44,7 @@ "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", diff --git a/README.md b/README.md index 3b8b7fcbade..1a755222a27 100644 --- a/README.md +++ b/README.md @@ -152,8 +152,7 @@ acquire this dependency. 3. Open a terminal in the IDE with `` Ctrl + ` `` (by default) or press on "View" in the top bar, and then "Terminal". 4. In the terminal, invoke `git submodule update --init --progress llvm-project vcpkg` 5. In the terminal, invoke `.\vcpkg\bootstrap-vcpkg.bat` -6. In the terminal, invoke `.\vcpkg\vcpkg.exe install boost-math:x86-windows boost-math:x64-windows` -7. Choose the architecture you wish to build in the IDE, and build as you would any other project. All necessary CMake +6. Choose the architecture you wish to build in the IDE, and build as you would any other project. All necessary CMake settings are set by `CMakeSettings.json`. # How To Build With A Native Tools Command Prompt @@ -168,7 +167,6 @@ acquire this dependency. 5. `cd STL` 6. `git submodule update --init --progress llvm-project vcpkg` 7. `.\vcpkg\bootstrap-vcpkg.bat` -8. `.\vcpkg\vcpkg.exe install boost-math:x86-windows boost-math:x64-windows` To build the x86 target: diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000000..463ca0d20c6 --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "stl", + "version-string": "143", + "builtin-baseline": "1257354a3ab0bebd8abe95281ca561537853578c", + "dependencies": [ + { + "name": "boost-math", + "version>=": "1.76.0" + } + ] +}