Skip to content

Commit 6b4377d

Browse files
authored
Merge pull request #7 from aminya/vcpkg
2 parents 9206efb + 4a9b101 commit 6b4377d

File tree

15 files changed

+500
-515
lines changed

15 files changed

+500
-515
lines changed

README.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ The package can be used locally or from CI services like GitHub Actions. Stay tu
1919
- gcc
2020
- cmake
2121
- ninja
22+
- vcpkg
2223
- meson
2324
- conan
2425
- ccache
@@ -42,26 +43,26 @@ Tip: You can automate downloading using `wget`, `curl` or other similar tools.
4243

4344
Download the executable for your platform from [here](https://github.com/aminya/setup-cpp/releases/tag/v0.2.2), and run it with the available options.
4445

45-
An example that installs llvm, cmake, ninja, ccache, and conan:
46+
An example that installs llvm, cmake, ninja, ccache, and vcpkg:
4647

4748
```ps1
4849
# windows example (open shell as admin)
4950
curl -O "https://github.com/aminya/setup-cpp/releases/download/v0.2.2/setup_cpp_windows.exe"
50-
./setup_cpp_windows --compiler llvm --cmake true --ninja true --ccache true --conan true
51+
./setup_cpp_windows --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
5152
```
5253

5354
```ps1
5455
# linux example
5556
wget "https://github.com/aminya/setup-cpp/releases/download/v0.2.2/setup_cpp_linux"
5657
chmod +x setup_cpp_linux
57-
sudo ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --conan true
58+
sudo ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
5859
```
5960

6061
```ps1
6162
# mac example
6263
wget "https://github.com/aminya/setup-cpp/releases/download/v0.2.2/setup_cpp_mac"
6364
chmod +x setup_cpp_mac
64-
sudo ./setup_cpp_mac --compiler llvm --cmake true --ninja true --ccache true --conan true
65+
sudo ./setup_cpp_mac --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
6566
```
6667

6768
NOTE: In the `compiler` entry, you can specify the version after `-` like `llvm-11`.
@@ -76,19 +77,19 @@ On Windows
7677
```ps1
7778
# open shell as admin
7879
curl "https://github.com/aminya/setup-cpp/releases/download/v0.2.2/setup_cpp.js"
79-
node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --conan true
80+
node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
8081
```
8182

8283
On Linux or Mac:
8384

8485
```ps1
8586
wget "https://github.com/aminya/setup-cpp/releases/download/v0.2.2/setup_cpp.js"
86-
sudo node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --conan true
87+
sudo node ./setup_cpp.js --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
8788
```
8889

8990
# Inside GitHub Actions
9091

91-
Here is a complete cross-platform example that tests llvm and gcc. It also uses cmake, ninja, conan, cppcheck, and ccache.
92+
Here is a complete cross-platform example that tests llvm and gcc. It also uses cmake, ninja, vcpkg, cppcheck, and ccache.
9293

9394
`.github/workflows/ci.yml`:
9495

@@ -144,8 +145,8 @@ RUN apt-get install -y --no-install-recommends ca-certificates wget unzip
144145
RUN wget --no-verbose "https://github.com/aminya/setup-cpp/releases/download/v0.2.2/setup_cpp_linux"
145146
RUN chmod +x ./setup_cpp_linux
146147

147-
# install llvm, cmake, ninja, ccache, and conan
148-
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --conan true
148+
# install llvm, cmake, ninja, ccache, and vcpkg
149+
RUN ./setup_cpp_linux --compiler llvm --cmake true --ninja true --ccache true --vcpkg true
149150

150151
ENTRYPOINT [ "/bin/sh" ]
151152
```
@@ -168,5 +169,4 @@ docker run -it setup_cpp
168169

169170
### Incomplete
170171

171-
- [ ] msvc. It is implemented, but has bugs. See [this issue](https://github.com/aminya/cpp/issues/1)
172-
- [ ] vcpkg (TODO)
172+
- msvc. It is implemented, but has bugs. See [this issue](https://github.com/aminya/setup-cpp/issues/1)

dist/setup_cpp.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/setup_cpp.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,23 +42,23 @@
4242
},
4343
"devDependencies": {
4444
"@types/cross-spawn": "^6.0.2",
45-
"@types/jest": "^27.0.2",
45+
"@types/jest": "^27.0.3",
4646
"@types/mri": "^1.1.1",
47-
"@types/node": "^16.11.6",
47+
"@types/node": "^16.11.9",
4848
"@types/semver": "^7.3.9",
4949
"@types/which": "^2.0.1",
5050
"caxa": "^2.1.0",
5151
"cross-env": "7.0.3",
5252
"cross-spawn": "^7.0.3",
53-
"eslint-config-atomic": "^1.16.4",
53+
"eslint-config-atomic": "^1.16.5",
5454
"jest": "^27.3.1",
5555
"npm-run-all2": "^5.0.2",
56-
"parcel": "^2.0.0",
56+
"parcel": "^2.0.1",
5757
"prettier-config-atomic": "^3.0.1",
5858
"shx": "0.3.3",
5959
"terser-config-atomic": "^0.1.1",
6060
"ts-jest": "^27.0.7",
61-
"typescript": "^4.4.4"
61+
"typescript": "^4.5.2"
6262
},
6363
"engines": {
6464
"node": ">=12.x"

0 commit comments

Comments
 (0)