From a2834754f0825b8e941a2d0566398fab704236b9 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Mon, 9 Aug 2021 21:05:58 +0700 Subject: [PATCH 1/3] add cmakeToolchain to CMakeSettings.json --- CMakeSettings.json | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeSettings.json b/CMakeSettings.json index f5c1dfff5c1..002ec12e5b1 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -10,7 +10,8 @@ "generator": "Ninja", "inheritEnvironments": [ "msvc_x86" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] + "variables": [], + "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" }, { "name": "x64", @@ -22,7 +23,8 @@ "generator": "Ninja", "inheritEnvironments": [ "msvc_x64_x64" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] + "variables": [], + "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" }, { "name": "ARM", @@ -34,7 +36,8 @@ "generator": "Ninja", "inheritEnvironments": [ "msvc_arm" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] + "variables": [], + "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" }, { "name": "ARM64", @@ -46,7 +49,8 @@ "generator": "Ninja", "inheritEnvironments": [ "msvc_arm64" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [] + "variables": [], + "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" } ] } From c271e4281a8eb184b2328d987e4a188376adb168 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Mon, 9 Aug 2021 21:24:42 +0700 Subject: [PATCH 2/3] change `/` to `\\` --- CMakeSettings.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeSettings.json b/CMakeSettings.json index 002ec12e5b1..12b274f1b4b 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -5,52 +5,52 @@ "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", "inheritEnvironments": [ "msvc_x86" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [], - "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" + "variables": [] }, { "name": "x64", "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", "inheritEnvironments": [ "msvc_x64_x64" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [], - "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" + "variables": [] }, { "name": "ARM", "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", "inheritEnvironments": [ "msvc_arm" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [], - "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" + "variables": [] }, { "name": "ARM64", "buildCommandArgs": "-v", "buildRoot": "${projectDir}\\out\\build\\${name}", "cmakeCommandArgs": "", + "cmakeToolchain": "${projectDir}\\vcpkg\\scripts\\buildsystems\\vcpkg.cmake", "configurationType": "Debug", "ctestCommandArgs": "", "generator": "Ninja", "inheritEnvironments": [ "msvc_arm64" ], "installRoot": "${projectDir}\\out\\install\\${name}", - "variables": [], - "cmakeToolchain": "./vcpkg/scripts/buildsystems/vcpkg.cmake" + "variables": [] } ] } From c6ce4836e073e9a6a388e561864b7b6761df172f Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Sat, 14 Aug 2021 16:16:58 +0700 Subject: [PATCH 3/3] adopt manifest mode --- README.md | 4 +--- vcpkg.json | 11 +++++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) create mode 100644 vcpkg.json 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" + } + ] +}