diff --git a/README.md b/README.md index 0a44450..04ebcd0 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,9 @@ cmake .. make install ``` +#### Making a conan package +If you are creating a conan package of this library you should disable CMake from running Conan by providing the following argument to CMake: `-DCONAN=DISABLE`. Furthermore, you must also use the `cmake_find_package` generator for CMake to be able to find the dependencies. + #### System installed dependencies If using conan is not an option, it is possible to build the library using system installed dependencies. This requires a bit more work though and might not be as reliable. diff --git a/documentation/changes.md b/documentation/changes.md index 6af9b9d..3341220 100644 --- a/documentation/changes.md +++ b/documentation/changes.md @@ -1,5 +1,13 @@ ## Changes +### Version 2.0.2 +* Made important CMkae changes required for properly making Conan packages. (ed-alertedh) +* Made minor changes to the code to prevent issues when using a `using namespace std;` statement. +* Minor documentation changes. + +### Version 2.0.1 +* Fixed faulty CMake code that did not properly import dependencies. + ### Version 2.0.0 * Added performance tests. * Replaced the home-brewed concurrent queue with a *much* faster open source one.