Skip to content

Commit

Permalink
Merge pull request #639 from johnmcfarlane/easier-setup
Browse files Browse the repository at this point in the history
Revised README and VSCode config
  • Loading branch information
johnmcfarlane authored Aug 25, 2020
2 parents dc46fce + 323e331 commit 507220f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 1 addition & 4 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
{
"cmake.configureSettings": {
"CMAKE_BUILD_TYPE": "Release",
"CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
"CMAKE_MODULE_PATH": "${workspaceFolder}/build",
"CMAKE_PROJECT_INCLUDE": "${workspaceFolder}/build/conan_paths.cmake",
},
}
8 changes: 5 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ The library is [hosted](https://github.com/johnmcfarlane/cnl) on GitHub:

```shell
git clone https://github.com/johnmcfarlane/cnl.git
cd cnl
```

### Build
Expand All @@ -50,7 +51,8 @@ CMake scripts are provided.
To build and install CNL on your system:

```sh
cmake cnl
mkdir build && cd build
cmake ..
cmake --build . --target install
```

Expand All @@ -65,13 +67,13 @@ Optional integration tests use Boost.Multiprecision and Boost.SIMD.
conan remote add --force johnmcfarlane/cnl https://api.bintray.com/conan/johnmcfarlane/cnl
conan profile new --detect --force default
conan profile update settings.compiler.libcxx=libstdc++11 default
conan install --build=missing cnl
conan install --build=missing ..
```

2. Configure the project for development

```shell
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PROJECT_cnl_INCLUDE:FILEPATH="$(pwd)"/conan_paths.cmake cnl
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PROJECT_cnl_INCLUDE:FILEPATH="$(pwd)"/conan_paths.cmake ..
```

3. Build tests:
Expand Down

0 comments on commit 507220f

Please sign in to comment.