diff options
| author | Arne H Juul <arnej27959@users.noreply.github.com> | 2020-10-02 15:08:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 15:08:40 +0200 |
| commit | c67283d48af378f25cf1bd3ed8e578d0e529813f (patch) | |
| tree | 6fb45410c5b117ba4dbe1cdf511dd30e57fc5292 /eval/CMakeLists.txt | |
| parent | 6867d23640ee3a1b1d037dd3a1316ca323701721 (diff) | |
| parent | d2a77e011a670b051f3dc3d7a70ed16d65ed6597 (diff) | |
Merge pull request #14680 from vespa-engine/arnej/add-generic-mixed-merge
Arnej/add generic mixed merge.
Diffstat (limited to 'eval/CMakeLists.txt')
| -rw-r--r-- | eval/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt index 03a19b8c2c4..1872ee1410a 100644 --- a/eval/CMakeLists.txt +++ b/eval/CMakeLists.txt @@ -33,6 +33,7 @@ vespa_define_module( src/tests/eval/value_type src/tests/gp/ponder_nov2017 src/tests/instruction/generic_join + src/tests/instruction/generic_merge src/tests/instruction/generic_rename src/tests/tensor/default_value_builder_factory src/tests/tensor/dense_add_dimension_optimizer |