Skip to content

Commit

Permalink
merge develop
Browse files Browse the repository at this point in the history
  • Loading branch information
liss-h authored Aug 30, 2024
2 parents 7be762f + 24ccaf1 commit 2e0337e
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)

project(
dice-hash
VERSION 0.4.7
VERSION 0.4.8
DESCRIPTION "dice-hash provides a framework to generate stable hashes. It provides state-of-the-art hash functions, supports STL containers out of the box and helps you to defines stable hashes for your own structs and classes."
HOMEPAGE_URL "https://dice-group.github.io/dice-hash/")
set(POBR_VERSION 1) # Persisted Object Binary Representation Version
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ To use it with [conan](https://conan.io/) you need to add the repository:
conan remote add dice-group https://conan.dice-research.org/artifactory/api/conan/tentris
```

To use it add `dice-hash/0.4.7` to the `[requires]` section of your conan file.
To use it add `dice-hash/0.4.8` to the `[requires]` section of your conan file.

You can now add it to your target with:
```cmake
Expand Down
3 changes: 0 additions & 3 deletions conanfile.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,13 @@ class DiceHashConan(ConanFile):
generators = ("CMakeDeps", "CMakeToolchain")
exports = "LICENSE"
exports_sources = "include/*", "CMakeLists.txt", "cmake/*", "LICENSE"
no_copy_source = True
options = {
"with_test_deps": [True, False],
}
default_options = {
"with_test_deps": False,
}

# No settings/options are necessary, this is header only

def set_name(self):
if not hasattr(self, 'name') or self.version is None:
cmake_file = load(self, os.path.join(self.recipe_folder, "CMakeLists.txt"))
Expand Down

0 comments on commit 2e0337e

Please sign in to comment.