eval -> vespaeval as library name.

27 files changed, 28 insertions, 29 deletions

diff --git a/document/CMakeLists.txt b/document/CMakeLists.txt
index 8e76a9009c5..c0089c2bed8 100644
--- a/document/CMakeLists.txt
+++ b/document/CMakeLists.txt
@@ -6,7 +6,7 @@ vespa_define_module(
     vespalib
     staging_vespalib
     config_cloudconfig
-    eval
+    vespaeval
 
     EXTERNAL_DEPENDS
     lz4
diff --git a/document/src/vespa/document/CMakeLists.txt b/document/src/vespa/document/CMakeLists.txt
index 6b8126a3258..1e5ed700d0b 100644
--- a/document/src/vespa/document/CMakeLists.txt
+++ b/document/src/vespa/document/CMakeLists.txt
@@ -16,5 +16,4 @@ vespa_add_library(document
     $<TARGET_OBJECTS:document_predicate>
     INSTALL lib64
     DEPENDS
-    eval
 )
diff --git a/eval/src/tests/eval/compile_cache/CMakeLists.txt b/eval/src/tests/eval/compile_cache/CMakeLists.txt
index 459c25d0a44..c309036aea7 100644
--- a/eval/src/tests/eval/compile_cache/CMakeLists.txt
+++ b/eval/src/tests/eval/compile_cache/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_compile_cache_test_app TEST
     SOURCES
     compile_cache_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_compile_cache_test_app COMMAND eval_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 29d4e0440a2..d9bd24c51df 100644
--- a/eval/src/tests/eval/compiled_function/CMakeLists.txt
+++ b/eval/src/tests/eval/compiled_function/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_compiled_function_test_app TEST
     SOURCES
     compiled_function_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_compiled_function_test_app COMMAND eval_compiled_function_test_app)
diff --git a/eval/src/tests/eval/function/CMakeLists.txt b/eval/src/tests/eval/function/CMakeLists.txt
index b4d47090028..c6960483130 100644
--- a/eval/src/tests/eval/function/CMakeLists.txt
+++ b/eval/src/tests/eval/function/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_function_test_app TEST
     SOURCES
     function_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_function_test_app COMMAND eval_function_test_app)
diff --git a/eval/src/tests/eval/function_speed/CMakeLists.txt b/eval/src/tests/eval/function_speed/CMakeLists.txt
index 69778bafefd..89a1477cefb 100644
--- a/eval/src/tests/eval/function_speed/CMakeLists.txt
+++ b/eval/src/tests/eval/function_speed/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_function_speed_test_app TEST
     SOURCES
     function_speed_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_function_speed_test_app NO_VALGRIND COMMAND eval_function_speed_test_app)
diff --git a/eval/src/tests/eval/gbdt/CMakeLists.txt b/eval/src/tests/eval/gbdt/CMakeLists.txt
index 744b7451c33..64ee0cb4e2d 100644
--- a/eval/src/tests/eval/gbdt/CMakeLists.txt
+++ b/eval/src/tests/eval/gbdt/CMakeLists.txt
@@ -3,13 +3,13 @@ vespa_add_executable(eval_gbdt_test_app TEST
     SOURCES
     gbdt_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_gbdt_test_app COMMAND eval_gbdt_test_app)
 vespa_add_executable(eval_gbdt_benchmark_app
     SOURCES
     gbdt_benchmark.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_gbdt_benchmark_app COMMAND eval_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 ab09743b9d4..3e96b4073b0 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(eval_interpreted_function_test_app TEST
     SOURCES
     interpreted_function_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_interpreted_function_test_app COMMAND eval_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 343f3b28a90..e29aa6e1abb 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(eval_node_types_test_app TEST
     SOURCES
     node_types_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_node_types_test_app COMMAND eval_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 02da07c15ac..e8fcdecb697 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(eval_simple_tensor_test_app TEST
     SOURCES
     simple_tensor_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_simple_tensor_test_app COMMAND eval_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 a5ab651d45f..028216e979a 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(eval_eval_tensor_function_test_app TEST
     SOURCES
     tensor_function_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_eval_tensor_function_test_app COMMAND eval_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 ad9f7aa1a36..0a5edf0f918 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(eval_value_cache_test_app TEST
     SOURCES
     value_cache_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_value_cache_test_app COMMAND eval_value_cache_test_app)
 vespa_add_executable(eval_tensor_loader_test_app TEST
     SOURCES
     tensor_loader_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_tensor_loader_test_app COMMAND eval_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 13ae644fb23..22258794ded 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(eval_value_type_test_app TEST
     SOURCES
     value_type_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_value_type_test_app NO_VALGRIND COMMAND eval_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 d042bdbe3c5..913e297e4ba 100644
--- a/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_dot_product_function/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_dense_dot_product_function_test_app TEST
     SOURCES
     dense_dot_product_function_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_dense_dot_product_function_test_app COMMAND eval_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 70f23d109bb..a931e25ddcd 100644
--- a/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_address_combiner/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_dense_tensor_address_combiner_test_app TEST
     SOURCES
     dense_tensor_address_combiner_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_dense_tensor_address_combiner_test_app COMMAND eval_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 85a512c380d..cee05f18e9f 100644
--- a/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_builder/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_dense_tensor_builder_test_app TEST
     SOURCES
     dense_tensor_builder_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_dense_tensor_builder_test_app COMMAND eval_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 2db9088a219..13253bbaf16 100644
--- a/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
+++ b/eval/src/tests/tensor/dense_tensor_function_compiler/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_dense_tensor_function_compiler_test_app TEST
     SOURCES
     dense_tensor_function_compiler_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_dense_tensor_function_compiler_test_app COMMAND eval_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 6ae45e57108..ba4d6996f06 100644
--- a/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
+++ b/eval/src/tests/tensor/sparse_tensor_builder/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_sparse_tensor_builder_test_app TEST
     SOURCES
     sparse_tensor_builder_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_sparse_tensor_builder_test_app COMMAND eval_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 f8dc392c310..2c834abe9d3 100644
--- a/eval/src/tests/tensor/tensor_address/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_address/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_tensor_address_test_app TEST
     SOURCES
     tensor_address_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_tensor_address_test_app COMMAND eval_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 b6369da08d9..4eebd437d6a 100644
--- a/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_conformance/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_tensor_tensor_conformance_test_app TEST
     SOURCES
     tensor_conformance_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_tensor_tensor_conformance_test_app COMMAND eval_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 3772e449054..80567594e92 100644
--- a/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_mapper/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_tensor_mapper_test_app TEST
     SOURCES
     tensor_mapper_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_tensor_mapper_test_app COMMAND eval_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 58c93afe9ee..61e98d2a1e0 100644
--- a/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_performance/CMakeLists.txt
@@ -3,7 +3,7 @@ vespa_add_executable(eval_tensor_performance_test_app TEST
     SOURCES
     tensor_performance_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(
     NAME eval_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 32a89e0af9f..a984e0c4594 100644
--- a/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_serialization/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_tensor_serialization_test_app TEST
     SOURCES
     tensor_serialization_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_tensor_serialization_test_app COMMAND eval_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 b1479f588da..f0f20bda68b 100644
--- a/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
+++ b/eval/src/tests/tensor/tensor_slime_serialization/CMakeLists.txt
@@ -3,6 +3,6 @@ vespa_add_executable(eval_tensor_slime_serialization_test_app TEST
     SOURCES
     tensor_slime_serialization_test.cpp
     DEPENDS
-    eval
+    vespaeval
 )
 vespa_add_test(NAME eval_tensor_slime_serialization_test_app COMMAND eval_tensor_slime_serialization_test_app)
diff --git a/eval/src/vespa/eval/CMakeLists.txt b/eval/src/vespa/eval/CMakeLists.txt
index 08f226de040..c4edc1f380f 100644
--- a/eval/src/vespa/eval/CMakeLists.txt
+++ b/eval/src/vespa/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(eval
+vespa_add_library(vespaeval
     SOURCES
     $<TARGET_OBJECTS:eval_eval>
     $<TARGET_OBJECTS:eval_eval_test>
diff --git a/searchcommon/CMakeLists.txt b/searchcommon/CMakeLists.txt
index c8ed07848d4..23d048fb3f5 100644
--- a/searchcommon/CMakeLists.txt
+++ b/searchcommon/CMakeLists.txt
@@ -6,7 +6,7 @@ vespa_define_module(
     vespalib
     config_cloudconfig
     configdefinitions
-    eval
+    vespaeval
 
     TESTS
     src/tests/attribute/config
diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt
index 4bed02092a5..4fa141f876f 100644
--- a/searchlib/CMakeLists.txt
+++ b/searchlib/CMakeLists.txt
@@ -5,7 +5,7 @@ vespa_define_module(
     vespalog
     vespalib
     staging_vespalib
-    eval
+    vespaeval
     fnet
     configdefinitions
     metrics