merge develop

Author: liss-h

.github/workflows/code_testing.yml

@@ -7,69 +7,69 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build_and_run_tests_and_examples:
+  build-and-run-tests-and-examples:
     strategy:
       fail-fast: false
       matrix:
         config:
           - os: ubuntu-22.04
-            compiler: clang-17
+            compiler: clang-15
+          - os: ubuntu-22.04
+            compiler: clang-16
+
+          - os: ubuntu-22.04
+            compiler: gcc-12
           - os: ubuntu-22.04
             compiler: gcc-13
     runs-on: ${{ matrix.config.os }}
-    name: ${{ matrix.config.os }} (${{ matrix.config.compiler }})
     steps:
-      - name: Add repo for gcc-13 and clang-17
+      - name: Add repos for for gcc-13 and clang-16
         run: |
           # gcc-13
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
-          
-          # clang-17
+
+          # clang-16
           source /etc/os-release
-          echo "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-17 main" | sudo tee /etc/apt/sources.list.d/llvm-17.list
-          curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/llvm.gpg > /dev/null
+          echo "deb http://apt.llvm.org/${UBUNTU_CODENAME}/ llvm-toolchain-${UBUNTU_CODENAME}-16 main" | sudo tee /etc/apt/sources.list.d/llvm-16.list
+          curl https://apt.llvm.org/llvm-snapshot.gpg.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/llvm-16.gpg > /dev/null
 
-      - name: Install libstdc++-13
-        run: |
-          sudo apt-get install libstdc++-13-dev -y
+          sudo apt-get update -y
 
-      - name: Get minimum cmake version
-        uses: lukka/get-cmake@latest
+      - name: Install CMake
+        uses: lukka/get-cmake@v3.24.3
         with:
-          cmakeVersion: 3.22.5
+          cmakeVersion: 3.16.9
 
       - name: Install compiler
         id: install_cc
         uses: rlalik/[email protected]
         with:
           compiler: ${{ matrix.config.compiler }}
 
-      - name: install conan packages
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y python3-pip
-          
-          pip3 install "conan==1.62.0"
-          conan profile new --detect default
-          conan profile update settings.compiler.libcxx=libstdc++11 default
+      - name: Install linker
+        uses: rui314/setup-mold@v1
 
       - uses: actions/checkout@v3
 
-      - name: build tests and examples
-        run: |
-          mkdir build
-          cd build 
-          cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=ON -DBUILD_EXAMPLES=ON -DWITH_SODIUM=ON -DCMAKE_CXX_FLAGS="-march=native" .. && make -j
+      - name: Configure CMake
+        run: cmake -DCMAKE_BUILD_TYPE=Debug -DBUILD_TESTING=On -DBUILD_EXAMPLES=On -G Ninja -B build .
         env:
           CC: ${{ steps.install_cc.outputs.cc }}
           CXX: ${{ steps.install_cc.outputs.cxx }}
+          CXXFLAGS: -fsanitize=undefined -fsanitize=address -fno-omit-frame-pointer -fno-optimize-sibling-calls
 
-      - name: run tests
+      - name: Build tests and examples
         working-directory: build
-        run: ctest --verbose --parallel 2 --exclude-regex "benchmark_*"
+        run: cmake --build . -j2
 
-      - name: run examples
+      - name: Run tests
+        working-directory: build
+        run: ctest --verbose -j2
+
+      - name: Run examples
+        working-directory: build
         run: |
-          for example in build/examples/example_*; do
-            ./$example
+          for example in $(find ./examples -maxdepth 1 -type f -executable); do
+            echo "running ${example}"
+            ./${example}
           done

.github/workflows/publish-conan-branch-package.yml

@@ -12,7 +12,7 @@ jobs:
     with:
       public_artifactory: true
       os: ubuntu-22.04
-      compiler: clang-17
+      compiler: clang-15
       cmake-version: 3.22.6
       conan-version: 2.0.13
     secrets:

CMakeLists.txt

@@ -1,8 +1,8 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.22)
 
 project(
         dice-hash
-        VERSION 0.4.3
+        VERSION 0.4.4
         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/")
 
@@ -82,13 +82,13 @@ endif ()
 include(cmake/install_library.cmake)
 install_cpp_library(${PROJECT_NAME} "src")
 
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_TESTING)
+if(PROJECT_IS_TOP_LEVEL AND BUILD_TESTING)
     include(CTest)
     enable_testing()
     add_subdirectory(tests)
 endif()
 
 option(BUILD_EXAMPLES "Build example programs" OFF)
-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND BUILD_EXAMPLES)
+if(PROJECT_IS_TOP_LEVEL AND BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()

README.md

@@ -30,7 +30,7 @@ add
 FetchContent_Declare(
         dice-hash
         GIT_REPOSITORY https://github.com/dice-group/dice-hash.git
-        GIT_TAG 0.4.3
+        GIT_TAG 0.4.4
         GIT_SHALLOW TRUE)
 
 FetchContent_MakeAvailable(dice-hash)
@@ -51,7 +51,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.3` to the `[requires]` section of your conan file.
+To use it add `dice-hash/0.4.4` to the `[requires]` section of your conan file.
 
 ## build and run tests
 

conanfile.py

@@ -1,4 +1,5 @@
-import re, os
+import re
+import os
 
 from conan import ConanFile
 from conan.tools.cmake import CMake, cmake_layout
@@ -54,27 +55,43 @@ def build(self):
         self._configure_cmake().build()
 
     def package(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.install()
+
+        for dir in ("lib", "res", "share"):
+            rmdir(self, os.path.join(self.package_folder, dir))
+
         self._configure_cmake().install()
         rmdir(self, os.path.join(self.package_folder, "cmake"))
         rmdir(self, os.path.join(self.package_folder, "share"))
         copy(self, pattern="LICENSE*", dst="licenses", src=self.folders.source_folder)
 
     def package_info(self):
-        self.cpp_info.components["global"].set_property("cmake_target_name", f"{self.name}::{self.name}")
-        self.cpp_info.components["global"].names["cmake_find_package_multi"] = f"{self.name}"
-        self.cpp_info.components["global"].names["cmake_find_package"] = f"{self.name}"
-        self.cpp_info.components["global"].includedirs = ["src"]
-        self.cpp_info.components["global"].libs = [f"{self.name}"]
-        self.cpp_info.components["global"].libdirs = ["lib"]
+        self.cpp_info.bindirs = []
+        self.cpp_info.libdirs = []
+
+        self.cpp_info.set_property("cmake_find_mode", "both")
+        self.cpp_info.set_property("cmake_target_name", "dice-hash::dice-hash")
+        self.cpp_info.set_property("cmake_file_name", "dice-hash")
+
+    def package_info(self):
+        self.cpp_info.set_property("cmake_find_mode", "both")
+        self.cpp_info.set_property("cmake_target_name", "dice-hash::dice-hash")
+        self.cpp_info.set_property("cmake_file_name", "dice-hash")
+
+        self.cpp_info.includedirs = ["src"]
+        self.cpp_info.libs = [f"{self.name}"]
+        self.cpp_info.libdirs = ["lib"]
 
-        self.cpp_info.components["global"].requires = []
+        self.cpp_info.requires = []
 
         if self.options.with_sodium:
-            self.cpp_info.components["global"].requires += [
+            self.cpp_info.requires += [
                 "libsodium::libsodium"
             ]
 
         if self.options.with_test_deps:
-            self.cpp_info.components["global"].requires += [
+            self.cpp_info.requires += [
                 "Metall::Metall"
             ]

test_package/conanfile.py

@@ -1,7 +1,7 @@
 import os
 from conan import ConanFile
-from conan.tools.cmake import CMake
-from conan.tools.layout import cmake_layout
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake, cmake_layout
 
 required_conan_version = ">=1.59"
 
@@ -11,6 +11,9 @@ class TestPackageConan(ConanFile):
     generators = "CMakeDeps", "CMakeToolchain"
     default_options = {"dice-hash:with_sodium": True}
 
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
     def layout(self):
         cmake_layout(self)
 
@@ -20,4 +23,6 @@ def build(self):
         cmake.build()
 
     def test(self):
-        self.run(os.path.join(self.cpp.build.bindirs[0], "example"), run_environment=True)
+        if can_run(self):
+            cmd = os.path.join(self.cpp.build.bindir, "example")
+            self.run(cmd, env="conanrun")