rapidfuzz-cpp: 1.0.1 -> 1.0.2

https://github.com/maxbachmann/rapidfuzz-cpp/releases/tag/v1.0.2
This commit is contained in:
Robert Schütz 2022-06-11 21:27:14 +00:00 committed by Robert Schütz
parent 01fb64af34
commit 87aef5e856
2 changed files with 72 additions and 6 deletions

View File

@ -2,20 +2,29 @@
, stdenv
, fetchFromGitHub
, cmake
, catch2
, catch2_3
}:
stdenv.mkDerivation rec {
pname = "rapidfuzz-cpp";
version = "1.0.1";
version = "1.0.2";
src = fetchFromGitHub {
owner = "maxbachmann";
repo = "rapidfuzz-cpp";
rev = "v${version}";
hash = "sha256-331iW0nu5MlxuKNTgMkRSASnglxn+hEWBhRMnw0lY2Y=";
hash = "sha256-Tf7nEMXiem21cvQHPnYnCvOOLg0KBBnNQDaYIcHcm2g=";
};
patches = lib.optionals doCheck [
./dont-fetch-project-options.patch
];
postPatch = ''
substituteInPlace test/CMakeLists.txt \
--replace WARNINGS_AS_ERRORS ""
'';
nativeBuildInputs = [
cmake
];
@ -25,11 +34,10 @@ stdenv.mkDerivation rec {
];
checkInputs = [
catch2
catch2_3
];
# uses unreleased Catch2 version 3
doCheck = false;
doCheck = true;
meta = {
description = "Rapid fuzzy string matching in C++ using the Levenshtein Distance";

View File

@ -0,0 +1,58 @@
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5ba4464..ad72319 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,39 +12,10 @@ else()
FetchContent_MakeAvailable(Catch2)
endif()
-# include aminya & jason turner's C++ best practices recommended cmake project utilities
-include(FetchContent)
-FetchContent_Declare(_project_options URL https://github.com/aminya/project_options/archive/refs/tags/v0.20.0.zip)
-FetchContent_MakeAvailable(_project_options)
-include(${_project_options_SOURCE_DIR}/Index.cmake)
-
-project_options(
- # ENABLE_CACHE
- # ENABLE_CONAN
- WARNINGS_AS_ERRORS
- # ENABLE_CPPCHECK
- # ENABLE_CLANG_TIDY
- # ENABLE_INCLUDE_WHAT_YOU_USE
- # ENABLE_COVERAGE
- # ENABLE_PCH
- # PCH_HEADERS <Eigen/Dense> <fmt/core.h> <vector> <utility> <string> <string_view>
- # ENABLE_DOXYGEN
- # ENABLE_IPO
- # ENABLE_USER_LINKER
- # ENABLE_BUILD_WITH_TIME_TRACE
- # ENABLE_UNITY
- # ENABLE_SANITIZER_ADDRESS
- # ENABLE_SANITIZER_LEAK
- # ENABLE_SANITIZER_UNDEFINED_BEHAVIOR
- # ENABLE_SANITIZER_THREAD
- # ENABLE_SANITIZER_MEMORY
- # CLANG_WARNINGS "-Weverything"
-)
-
function(rapidfuzz_add_test test)
add_executable(test_${test} tests-${test}.cpp)
target_link_libraries(test_${test} ${PROJECT_NAME})
- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings)
+ target_link_libraries(test_${test} Catch2::Catch2WithMain)
add_test(NAME ${test} COMMAND test_${test})
endfunction()
diff --git a/test/distance/CMakeLists.txt b/test/distance/CMakeLists.txt
index 2a70054..7a43c88 100644
--- a/test/distance/CMakeLists.txt
+++ b/test/distance/CMakeLists.txt
@@ -1,7 +1,7 @@
function(rapidfuzz_add_test test)
add_executable(test_${test} tests-${test}.cpp)
target_link_libraries(test_${test} ${PROJECT_NAME})
- target_link_libraries(test_${test} Catch2::Catch2WithMain project_warnings)
+ target_link_libraries(test_${test} Catch2::Catch2WithMain)
add_test(NAME ${test} COMMAND test_${test})
endfunction()