Fold searchlib_uca into searchlib

5 files changed, 5 insertions, 10 deletions

diff --git a/searchlib/src/tests/forcelink/CMakeLists.txt b/searchlib/src/tests/forcelink/CMakeLists.txt
index 81ce6beab32..a6af5a77b0c 100644
--- a/searchlib/src/tests/forcelink/CMakeLists.txt
+++ b/searchlib/src/tests/forcelink/CMakeLists.txt
@@ -4,6 +4,5 @@ vespa_add_executable(searchlib_forcelink_test_app TEST
     forcelink.cpp
     DEPENDS
     searchlib
-    searchlib_searchlib_uca
 )
 vespa_add_test(NAME searchlib_forcelink_test_app COMMAND searchlib_forcelink_test_app)
diff --git a/searchlib/src/tests/sort/CMakeLists.txt b/searchlib/src/tests/sort/CMakeLists.txt
index c59b3a4d8af..e342237adf0 100644
--- a/searchlib/src/tests/sort/CMakeLists.txt
+++ b/searchlib/src/tests/sort/CMakeLists.txt
@@ -11,7 +11,6 @@ vespa_add_executable(searchlib_sort_test_app
     sort_test.cpp
     DEPENDS
     searchlib
-    searchlib_searchlib_uca
 )
 #vespa_add_test(NAME searchlib_sort_test_app COMMAND searchlib_sort_test_app)
 vespa_add_executable(searchlib_uca_stress_app
@@ -19,6 +18,5 @@ vespa_add_executable(searchlib_uca_stress_app
     uca.cpp
     DEPENDS
     searchlib
-    searchlib_searchlib_uca
 )
 vespa_add_test(NAME searchlib_uca_stress_app COMMAND searchlib_uca_stress_app BENCHMARK)
diff --git a/searchlib/src/tests/sortspec/CMakeLists.txt b/searchlib/src/tests/sortspec/CMakeLists.txt
index 5ebaa22f154..a9b3a906804 100644
--- a/searchlib/src/tests/sortspec/CMakeLists.txt
+++ b/searchlib/src/tests/sortspec/CMakeLists.txt
@@ -4,6 +4,5 @@ vespa_add_executable(searchlib_multilevelsort_test_app TEST
     multilevelsort.cpp
     DEPENDS
     searchlib
-    searchlib_searchlib_uca
 )
 vespa_add_test(NAME searchlib_multilevelsort_test_app COMMAND searchlib_multilevelsort_test_app)
diff --git a/searchlib/src/vespa/searchlib/CMakeLists.txt b/searchlib/src/vespa/searchlib/CMakeLists.txt
index 91813a17379..71442e27592 100644
--- a/searchlib/src/vespa/searchlib/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/CMakeLists.txt
@@ -1,4 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+find_package(ICU 60.0 REQUIRED COMPONENTS uc i18n)
 vespa_add_library(searchlib
     SOURCES
     $<TARGET_OBJECTS:searchlib_aggregation>
@@ -28,6 +29,7 @@ vespa_add_library(searchlib
     $<TARGET_OBJECTS:searchlib_searchlib_index>
     $<TARGET_OBJECTS:searchlib_tensor>
     $<TARGET_OBJECTS:searchlib_transactionlog>
+    $<TARGET_OBJECTS:searchlib_uca>
     $<TARGET_OBJECTS:searchlib_util>
     $<TARGET_OBJECTS:searchcommon_searchcommon_common>
     $<TARGET_OBJECTS:searchcommon_searchcommon_attribute>
@@ -35,6 +37,8 @@ vespa_add_library(searchlib
     INSTALL lib64
     DEPENDS
     vespalib
+    ICU::i18n
+    ICU::uc
     ${VESPA_ATOMIC_LIB}
 )
 
diff --git a/searchlib/src/vespa/searchlib/uca/CMakeLists.txt b/searchlib/src/vespa/searchlib/uca/CMakeLists.txt
index 6a4602381f4..75be1472a83 100644
--- a/searchlib/src/vespa/searchlib/uca/CMakeLists.txt
+++ b/searchlib/src/vespa/searchlib/uca/CMakeLists.txt
@@ -1,12 +1,7 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-find_package(ICU 60.0 REQUIRED COMPONENTS uc i18n)
-vespa_add_library(searchlib_searchlib_uca
+vespa_add_library(searchlib_uca OBJECT
     SOURCES
     ucaconverter.cpp
     ucafunctionnode.cpp
-    INSTALL lib64
     DEPENDS
-    searchlib
-    ICU::i18n
-    ICU::uc
 )