build 'eval' as a single library

33 files changed, 50 insertions, 65 deletions

diff --git a/eval/CMakeLists.txt b/eval/CMakeLists.txt
index 5e2cdbe1f44..c7e5b273ec1 100644
--- a/eval/CMakeLists.txt
+++ b/eval/CMakeLists.txt
@@ -31,6 +31,7 @@ vespa_define_module(
     src/tests/tensor/tensor_slime_serialization
 
     LIBS
+    src/vespa/eval
     src/vespa/eval/eval
     src/vespa/eval/eval/test
     src/vespa/eval/eval/value_cache
diff --git a/eval/src/apps/eval_expr/CMakeLists.txt b/eval/src/apps/eval_expr/CMakeLists.txt
index f576295717a..8ceee029ec3 100644
--- a/eval/src/apps/eval_expr/CMakeLists.txt
+++ b/eval/src/apps/eval_expr/CMakeLists.txt
@@ -4,6 +4,5 @@ vespa_add_executable(vespalib_eval_expr_app
     eval_expr.cpp
     INSTALL bin
     DEPENDS
-    vespalib
-#    vespalib_vespalib_eval
+    eval
 )
diff --git a/eval/src/tests/eval/compile_cache/CMakeLists.txt b/eval/src/tests/eval/compile_cache/CMakeLists.txt
index 5484ee9580b..1bfcdb808e4 100644
--- a/eval/src/tests/eval/compile_cache/CMakeLists.txt
+++ b/eval/src/tests/eval/compile_cache/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_compile_cache_test_app TEST
     SOURCES
     compile_cache_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_eval_llvm
+    eval
 )
 vespa_add_test(NAME vespalib_compile_cache_test_app COMMAND vespalib_compile_cache_test_app)
diff --git a/eval/src/tests/eval/compiled_function/CMakeLists.txt b/eval/src/tests/eval/compiled_function/CMakeLists.txt
index c362811c93e..7443fcf7d8c 100644
--- a/eval/src/tests/eval/compiled_function/CMakeLists.txt
+++ b/eval/src/tests/eval/compiled_function/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_compiled_function_test_app TEST
     SOURCES
     compiled_function_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_eval_llvm
+    eval
 )
 vespa_add_test(NAME vespalib_compiled_function_test_app COMMAND vespalib_compiled_function_test_app)
diff --git a/eval/src/tests/eval/function/CMakeLists.txt b/eval/src/tests/eval/function/CMakeLists.txt
index 7c7268eb492..d9c5c2b03e9 100644
--- a/eval/src/tests/eval/function/CMakeLists.txt
+++ b/eval/src/tests/eval/function/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vespalib_function_test_app TEST
     SOURCES
     function_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_function_test_app COMMAND vespalib_function_test_app)
diff --git a/eval/src/tests/eval/function_speed/CMakeLists.txt b/eval/src/tests/eval/function_speed/CMakeLists.txt
index 310de28cf43..b69bd2f622d 100644
--- a/eval/src/tests/eval/function_speed/CMakeLists.txt
+++ b/eval/src/tests/eval/function_speed/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_function_speed_test_app TEST
     SOURCES
     function_speed_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_eval_llvm
+    eval
 )
 vespa_add_test(NAME vespalib_function_speed_test_app NO_VALGRIND COMMAND vespalib_function_speed_test_app)
diff --git a/eval/src/tests/eval/gbdt/CMakeLists.txt b/eval/src/tests/eval/gbdt/CMakeLists.txt
index d6fc1c12e10..6c9be3b1a77 100644
--- a/eval/src/tests/eval/gbdt/CMakeLists.txt
+++ b/eval/src/tests/eval/gbdt/CMakeLists.txt
@@ -3,15 +3,13 @@ vespa_add_executable(vespalib_gbdt_test_app TEST
     SOURCES
     gbdt_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_eval_llvm
+    eval
 )
 vespa_add_test(NAME vespalib_gbdt_test_app COMMAND vespalib_gbdt_test_app)
 vespa_add_executable(vespalib_gbdt_benchmark_app
     SOURCES
     gbdt_benchmark.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_eval_llvm
+    eval
 )
 vespa_add_test(NAME vespalib_gbdt_benchmark_app COMMAND vespalib_gbdt_benchmark_app BENCHMARK)
diff --git a/eval/src/tests/eval/interpreted_function/CMakeLists.txt b/eval/src/tests/eval/interpreted_function/CMakeLists.txt
index 09d7ce7364b..363331408d3 100644
--- a/eval/src/tests/eval/interpreted_function/CMakeLists.txt
+++ b/eval/src/tests/eval/interpreted_function/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vespalib_interpreted_function_test_app TEST
     SOURCES
     interpreted_function_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_interpreted_function_test_app COMMAND vespalib_interpreted_function_test_app)
diff --git a/eval/src/tests/eval/node_types/CMakeLists.txt b/eval/src/tests/eval/node_types/CMakeLists.txt
index 2471815fa51..6dc7f1ec87e 100644
--- a/eval/src/tests/eval/node_types/CMakeLists.txt
+++ b/eval/src/tests/eval/node_types/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vespalib_node_types_test_app TEST
     SOURCES
     node_types_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_node_types_test_app COMMAND vespalib_node_types_test_app)
diff --git a/eval/src/tests/eval/simple_tensor/CMakeLists.txt b/eval/src/tests/eval/simple_tensor/CMakeLists.txt
index cbd65296abc..76c411799f1 100644
--- a/eval/src/tests/eval/simple_tensor/CMakeLists.txt
+++ b/eval/src/tests/eval/simple_tensor/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vespalib_simple_tensor_test_app TEST
     SOURCES
     simple_tensor_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_simple_tensor_test_app COMMAND vespalib_simple_tensor_test_app)
diff --git a/eval/src/tests/eval/tensor_function/CMakeLists.txt b/eval/src/tests/eval/tensor_function/CMakeLists.txt
index cabe37160ac..cef0ae4ca9b 100644
--- a/eval/src/tests/eval/tensor_function/CMakeLists.txt
+++ b/eval/src/tests/eval/tensor_function/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vespalib_eval_tensor_function_test_app TEST
     SOURCES
     tensor_function_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_eval_tensor_function_test_app COMMAND vespalib_eval_tensor_function_test_app)
diff --git a/eval/src/tests/eval/value_cache/CMakeLists.txt b/eval/src/tests/eval/value_cache/CMakeLists.txt
index 6a752ae6b60..67f7443dd6f 100644
--- a/eval/src/tests/eval/value_cache/CMakeLists.txt
+++ b/eval/src/tests/eval/value_cache/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(vespalib_value_cache_test_app TEST
     SOURCES
     value_cache_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_value_cache_test_app COMMAND vespalib_value_cache_test_app)
 vespa_add_executable(vespalib_tensor_loader_test_app TEST
     SOURCES
     tensor_loader_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_tensor_loader_test_app COMMAND vespalib_tensor_loader_test_app)
diff --git a/eval/src/tests/eval/value_type/CMakeLists.txt b/eval/src/tests/eval/value_type/CMakeLists.txt
index c6ef9f61359..3afe7608955 100644
--- a/eval/src/tests/eval/value_type/CMakeLists.txt
+++ b/eval/src/tests/eval/value_type/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(vespalib_value_type_test_app TEST
     SOURCES
     value_type_test.cpp
     DEPENDS
-    vespalib
+    eval
 )
 vespa_add_test(NAME vespalib_value_type_test_app NO_VALGRIND COMMAND vespalib_value_type_test_app)
diff --git a/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt b/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
index d02f2cf7646..9b81004ee13 100644
--- a/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_dense_dot_product_function_test_app TEST
     SOURCES
     dense_dot_product_function_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_dense_dot_product_function_test_app COMMAND vespalib_dense_dot_product_function_test_app)
diff --git a/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt b/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
index 65e7c711b19..6435466bc93 100644
--- a/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_dense_tensor_address_combiner_test_app TEST
     SOURCES
     dense_tensor_address_combiner_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_dense_tensor_address_combiner_test_app COMMAND vespalib_dense_tensor_address_combiner_test_app)
diff --git a/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt b/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
index 9028138ab87..0abfd884411 100644
--- a/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_dense_tensor_builder_test_app TEST
     SOURCES
     dense_tensor_builder_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_dense_tensor_builder_test_app COMMAND vespalib_dense_tensor_builder_test_app)
diff --git a/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt b/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
index a34b39abb70..a3b57bcf5c9 100644
--- a/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_dense_tensor_function_compiler_test_app TEST
     SOURCES
     dense_tensor_function_compiler_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_dense_tensor_function_compiler_test_app COMMAND vespalib_dense_tensor_function_compiler_test_app)
diff --git a/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt b/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
index c8ae7ece908..b866610e749 100644
--- a/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
+++ b/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_sparse_tensor_builder_test_app TEST
     SOURCES
     sparse_tensor_builder_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_sparse_tensor_builder_test_app COMMAND vespalib_sparse_tensor_builder_test_app)
diff --git a/eval/src/tests/tensor/tensor_address/CMakeLists.txt b/eval/src/tests/tensor/tensor_address/CMakeLists.txt
index 43c45f913a5..ed13b0b6eb0 100644
--- a/eval/src/tests/tensor/tensor_address/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_address/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_tensor_address_test_app TEST
     SOURCES
     tensor_address_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_tensor_address_test_app COMMAND vespalib_tensor_address_test_app)
diff --git a/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt b/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
index 0aaddb481cc..40fb4bff19f 100644
--- a/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_tensor_tensor_conformance_test_app TEST
     SOURCES
     tensor_conformance_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_tensor_tensor_conformance_test_app COMMAND vespalib_tensor_tensor_conformance_test_app)
diff --git a/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt b/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
index fb18883f7ef..e9cd3e9fe9d 100644
--- a/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_tensor_mapper_test_app TEST
     SOURCES
     tensor_mapper_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_tensor_mapper_test_app COMMAND vespalib_tensor_mapper_test_app)
diff --git a/eval/src/tests/tensor/tensor_performance/CMakeLists.txt b/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
index a2f041db265..cb98b72022d 100644
--- a/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
@@ -3,8 +3,7 @@ vespa_add_executable(vespalib_tensor_performance_test_app TEST
     SOURCES
     tensor_performance_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(
     NAME vespalib_tensor_performance_test_app
diff --git a/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt b/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
index 2fdf47d4738..d1098d2f2de 100644
--- a/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_tensor_serialization_test_app TEST
     SOURCES
     tensor_serialization_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_tensor_serialization_test_app COMMAND vespalib_tensor_serialization_test_app)
diff --git a/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt b/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
index a0323928fd3..a5cc1f0eaee 100644
--- a/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
@@ -3,7 +3,6 @@ vespa_add_executable(vespalib_tensor_slime_serialization_test_app TEST
     SOURCES
     tensor_slime_serialization_test.cpp
     DEPENDS
-    vespalib
-    vespalib_vespalib_tensor
+    eval
 )
 vespa_add_test(NAME vespalib_tensor_slime_serialization_test_app COMMAND vespalib_tensor_slime_serialization_test_app)
diff --git a/eval/src/vespa/eval/CMakeLists.txt b/eval/src/vespa/eval/CMakeLists.txt
new file mode 100644
index 00000000000..adaeab701ad
--- /dev/null
+++ b/eval/src/vespa/eval/CMakeLists.txt
@@ -0,0 +1,16 @@
+# Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+vespa_add_library(eval
+    SOURCES
+    $<TARGET_OBJECTS:eval_eval>
+    $<TARGET_OBJECTS:eval_eval_test>
+    $<TARGET_OBJECTS:eval_eval_value_cache>
+    $<TARGET_OBJECTS:eval_eval_llvm>
+    $<TARGET_OBJECTS:eval_tensor>
+    $<TARGET_OBJECTS:eval_tensor_sparse>
+    $<TARGET_OBJECTS:eval_tensor_dense>
+    $<TARGET_OBJECTS:eval_tensor_serialization>
+    INSTALL lib64
+    DEPENDS
+    vespalib
+    LLVM-3.4
+)
diff --git a/eval/src/vespa/eval/eval/CMakeLists.txt b/eval/src/vespa/eval/eval/CMakeLists.txt
index 2e28f3252bd..1a2b708b6c5 100644
--- a/eval/src/vespa/eval/eval/CMakeLists.txt
+++ b/eval/src/vespa/eval/eval/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_eval OBJECT
+vespa_add_library(eval_eval OBJECT
     SOURCES
     basic_nodes.cpp
     call_nodes.cpp
diff --git a/eval/src/vespa/eval/eval/llvm/CMakeLists.txt b/eval/src/vespa/eval/eval/llvm/CMakeLists.txt
index 238dceb4026..dfa91198fef 100644
--- a/eval/src/vespa/eval/eval/llvm/CMakeLists.txt
+++ b/eval/src/vespa/eval/eval/llvm/CMakeLists.txt
@@ -1,12 +1,8 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_eval_llvm
+vespa_add_library(eval_eval_llvm OBJECT
     SOURCES
     compile_cache.cpp
     compiled_function.cpp
     deinline_forest.cpp
     llvm_wrapper.cpp
-    INSTALL lib64
-    DEPENDS
-    vespalib
-    LLVM-3.4
 )
diff --git a/eval/src/vespa/eval/eval/test/CMakeLists.txt b/eval/src/vespa/eval/eval/test/CMakeLists.txt
index 3d132b4d113..321885124d6 100644
--- a/eval/src/vespa/eval/eval/test/CMakeLists.txt
+++ b/eval/src/vespa/eval/eval/test/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_eval_test OBJECT
+vespa_add_library(eval_eval_test OBJECT
     SOURCES
     eval_spec.cpp
     tensor_conformance.cpp
-    DEPENDS
 )
diff --git a/eval/src/vespa/eval/eval/value_cache/CMakeLists.txt b/eval/src/vespa/eval/eval/value_cache/CMakeLists.txt
index 62cb89a9d0e..b431bca0728 100644
--- a/eval/src/vespa/eval/eval/value_cache/CMakeLists.txt
+++ b/eval/src/vespa/eval/eval/value_cache/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_eval_value_cache OBJECT
+vespa_add_library(eval_eval_value_cache OBJECT
     SOURCES
     constant_value_cache.cpp
     constant_tensor_loader.cpp
-    DEPENDS
 )
diff --git a/eval/src/vespa/eval/tensor/CMakeLists.txt b/eval/src/vespa/eval/tensor/CMakeLists.txt
index 7ed5e4d60d5..3b4111cc723 100644
--- a/eval/src/vespa/eval/tensor/CMakeLists.txt
+++ b/eval/src/vespa/eval/tensor/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_tensor
+vespa_add_library(eval_tensor OBJECT
     SOURCES
     default_tensor_engine.cpp
     tensor.cpp
@@ -7,10 +7,4 @@ vespa_add_library(vespalib_vespalib_tensor
     tensor_apply.cpp
     tensor_factory.cpp
     tensor_mapper.cpp
-    $<TARGET_OBJECTS:vespalib_vespalib_tensor_sparse>
-    $<TARGET_OBJECTS:vespalib_vespalib_tensor_dense>
-    $<TARGET_OBJECTS:vespalib_vespalib_tensor_serialization>
-    INSTALL lib64
-    DEPENDS
-    vespalib
 )
diff --git a/eval/src/vespa/eval/tensor/dense/CMakeLists.txt b/eval/src/vespa/eval/tensor/dense/CMakeLists.txt
index 094c57619dc..5bc7ab41dba 100644
--- a/eval/src/vespa/eval/tensor/dense/CMakeLists.txt
+++ b/eval/src/vespa/eval/tensor/dense/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_tensor_dense OBJECT
+vespa_add_library(eval_tensor_dense OBJECT
     SOURCES
     direct_dense_tensor_builder.cpp
     dense_dot_product_function.cpp
@@ -10,5 +10,4 @@ vespa_add_library(vespalib_vespalib_tensor_dense OBJECT
     dense_tensor_function_compiler.cpp
     dense_tensor_view.cpp
     mutable_dense_tensor_view.cpp
-    DEPENDS
 )
diff --git a/eval/src/vespa/eval/tensor/serialization/CMakeLists.txt b/eval/src/vespa/eval/tensor/serialization/CMakeLists.txt
index 1f178dd7118..ebdfc2e22dc 100644
--- a/eval/src/vespa/eval/tensor/serialization/CMakeLists.txt
+++ b/eval/src/vespa/eval/tensor/serialization/CMakeLists.txt
@@ -1,9 +1,8 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_tensor_serialization OBJECT
+vespa_add_library(eval_tensor_serialization OBJECT
     SOURCES
     sparse_binary_format.cpp
     dense_binary_format.cpp
     slime_binary_format.cpp
     typed_binary_format.cpp
-    DEPENDS
 )
diff --git a/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt b/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
index 7d8725ad610..5d4adf1e870 100644
--- a/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
+++ b/eval/src/vespa/eval/tensor/sparse/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-vespa_add_library(vespalib_vespalib_tensor_sparse OBJECT
+vespa_add_library(eval_tensor_sparse OBJECT
     SOURCES
     sparse_tensor.cpp
     sparse_tensor_address_combiner.cpp
@@ -7,5 +7,4 @@ vespa_add_library(vespalib_vespalib_tensor_sparse OBJECT
     sparse_tensor_match.cpp
     sparse_tensor_builder.cpp
     sparse_tensor_unsorted_address_builder.cpp
-    DEPENDS
 )