Skip to content

Commit ed4c513

Browse files
cen1carlbennett
authored andcommitted
readme improvements
1 parent 0a54521 commit ed4c513

1 file changed

Lines changed: 7 additions & 19 deletions

File tree

README.md

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,17 @@ To force a specific build (32bit or 64bit) add `-DCMAKE_GENERATOR_PLATFORM=x86`
1919

2020
### Windows Visual Studio 2019
2121

22-
Static
23-
```
24-
conan install . -if ./build -s compiler.version=16 -s arch=x86_64 -o *:shared=False
25-
cmake -G "Visual Studio 16 2019" -B./build -DBUILD_SHARED_LIBS=0 -DCMAKE_GENERATOR_PLATFORM=Win32
26-
```
22+
Version 2019 has compiler version 16, 2015 has compiler version 14.
2723

28-
Shared
29-
```
30-
conan install . -if ./build -s compiler.version=16 -s arch=x86_64 -o *:shared=True
31-
cmake -G "Visual Studio 16 2019" -B./build -DBUILD_SHARED_LIBS=1 -DCMAKE_GENERATOR_PLATFORM=x64
32-
```
24+
Change `-o *:shared` option if you want to link static or dynamic dependencies.
3325

34-
### Windows Visual Studio 2015
26+
Change `BUILD_SHARED_LIBS` to build the library as static or shared.
3527

36-
Shared
3728
```
38-
conan install . -if ./build -s compiler.version=14 -s arch=x86_64 -o *:shared=True
39-
cmake -G "Visual Studio 14 2015" -B./build -DBUILD_SHARED_LIBS=1 -DCMAKE_GENERATOR_PLATFORM=x64
29+
conan install . -if ./build -s compiler.version=16 -s arch=x86_64 -o *:shared=True
30+
cmake -G "Visual Studio 16 2019" -B./build -DBUILD_SHARED_LIBS=1 -DCMAKE_GENERATOR_PLATFORM=x64
4031
```
4132

42-
43-
Open `.sln` in `build` directory and build from Visual Studio.
44-
4533
### Linux
4634
```
4735
conan install . -if ./build
@@ -53,13 +41,13 @@ cd build && make && make install
5341
Instead of using conan you can link against system provided gmp. Install `libgmp-dev` on deb distros or `gmp-devel` on rpm distros. For 32bit builds, CMake will not warn you if you are missing 32bit glibc and GMP, you must install them manually first (CentOS/Fedora: `glibc-devel.i686` and `gmp-devel.i686`).
5442

5543
```
56-
cmake -G "Unix Makefiles" -B./build
44+
cmake -G "Unix Makefiles" -B./build -DUSE_SYSTEM_LIBS=1
5745
cd build && make && make install
5846
```
5947

6048
## Building .deb and .rpm packages
6149
After invoking CMake, cd to build folder and generate them with `cpack -G "DEB"` and `cpack -G "RPM"`.
62-
You can then use `gdebi` to do a local install of .deb with automatic dependency resolution or `yum localinstall` on rpm distros. For dnf it's just `dnf install <name>.rpm`.
50+
You can then use `gdebi` to do a local install of .deb with automatic dependency resolution or `yum localinstall` on rpm distros. For dnf it's `dnf install <name>.rpm`.
6351

6452
## Hosted Linux repositories
6553
DEB and RPM repositories are maintained with best effort.

0 commit comments

Comments
 (0)