Loading pkgs/development/libraries/taskflow/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; version = "3.7.0"; version = "3.8.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; hash = "sha256-gim1QQKtzMXz8BmNg5YeN4mcveiid5MrS8IrTaTtZ1Y="; }; patches = [ Loading pkgs/development/libraries/taskflow/unvendor-doctest.patch +4 −4 Original line number Diff line number Diff line diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 3397d798..8277191e 100644 index c1fef333..eaf387ea 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -1,6 +1,6 @@ Loading @@ -9,11 +9,11 @@ index 3397d798..8277191e 100644 +include(@doctest@/lib/cmake/doctest/doctest.cmake) list(APPEND TF_UNITTESTS utility @@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS test_utility @@ -44,7 +44,7 @@ endif() foreach(unittest IN LISTS TF_UNITTESTS) add_executable(${unittest} ${unittest}.cpp) target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) target_link_libraries(${unittest} ${PROJECT_NAME} ${ATOMIC_LIBRARY} tf::default_settings) - target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) + target_include_directories(${unittest} PRIVATE @doctest@/include/doctest) doctest_discover_tests(${unittest}) Loading Loading
pkgs/development/libraries/taskflow/default.nix +2 −2 Original line number Diff line number Diff line Loading @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "taskflow"; version = "3.7.0"; version = "3.8.0"; src = fetchFromGitHub { owner = "taskflow"; repo = "taskflow"; rev = "v${version}"; hash = "sha256-q2IYhG84hPIZhuogWf6ojDG9S9ZyuJz9s14kQyIc6t0="; hash = "sha256-gim1QQKtzMXz8BmNg5YeN4mcveiid5MrS8IrTaTtZ1Y="; }; patches = [ Loading
pkgs/development/libraries/taskflow/unvendor-doctest.patch +4 −4 Original line number Diff line number Diff line diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 3397d798..8277191e 100644 index c1fef333..eaf387ea 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -1,6 +1,6 @@ Loading @@ -9,11 +9,11 @@ index 3397d798..8277191e 100644 +include(@doctest@/lib/cmake/doctest/doctest.cmake) list(APPEND TF_UNITTESTS utility @@ -24,7 +24,7 @@ list(APPEND TF_UNITTESTS test_utility @@ -44,7 +44,7 @@ endif() foreach(unittest IN LISTS TF_UNITTESTS) add_executable(${unittest} ${unittest}.cpp) target_link_libraries(${unittest} ${PROJECT_NAME} tf::default_settings) target_link_libraries(${unittest} ${PROJECT_NAME} ${ATOMIC_LIBRARY} tf::default_settings) - target_include_directories(${unittest} PRIVATE ${TF_3RD_PARTY_DIR}/doctest) + target_include_directories(${unittest} PRIVATE @doctest@/include/doctest) doctest_discover_tests(${unittest}) Loading