Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
abdes committed Mar 6, 2022
2 parents 59e3be5 + 1289675 commit dd62b5a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/cmake-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
- {
name: "Windows Latest MSVC",
os: windows-latest,
artifact: "windows_msvc.7z",
artifact: "Windows-MSVC.7z",
build_type: "Release",
cc: "cl",
cxx: "cl",
Expand All @@ -30,7 +30,7 @@ jobs:
- {
name: "Ubuntu_GCC_10",
os: ubuntu-latest,
artifact: "ubuntu_gcc10.7z",
artifact: "Linux.7z",
build_type: "Release",
cc: "gcc-10",
cxx: "g++-10",
Expand All @@ -40,7 +40,7 @@ jobs:
- {
name: "Ubuntu_GCC_11",
os: ubuntu-latest,
artifact: "ubuntu_gcc11.7z",
artifact: "Linux-GCC-11.7z",
build_type: "Release",
cc: "gcc",
cxx: "g++",
Expand All @@ -50,7 +50,7 @@ jobs:
- {
name: "macOS Latest Clang",
os: macos-latest,
artifact: "macos_clang.7z",
artifact: "macOS.7z",
build_type: "Release",
cc: "clang",
cxx: "clang++",
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ npm install -g standard-version
mkdir _build && cd _build && cmake .. && cmake --build .
```

or just use one of the predefined `CMake` presets. Detailed instructions and
many useful commands are listed
or just use one of the predefined `CMake` presets. Detailed instructions and
many useful commands are listed
[here](https://abdes.github.io/asap/master/html/01-getting-started/useful-commands.html).

### CMake configurable build options
### CMake configurable build options

```cmake
# Project options
Expand Down

0 comments on commit dd62b5a

Please sign in to comment.