diff options
28 files changed, 28 insertions, 6 deletions
diff --git a/document/src/test/resources/tensor/multi_cell_tensor__cpp b/document/src/test/resources/tensor/multi_cell_tensor__cpp Binary files differindex 090e1c57959..cda97503f15 100644 --- a/document/src/test/resources/tensor/multi_cell_tensor__cpp +++ b/document/src/test/resources/tensor/multi_cell_tensor__cpp diff --git a/fsa/src/vespa/fsamanagers/CMakeLists.txt b/fsa/src/vespa/fsamanagers/CMakeLists.txt index e5de5bc1b1a..0cc044d2dc8 100644 --- a/fsa/src/vespa/fsamanagers/CMakeLists.txt +++ b/fsa/src/vespa/fsamanagers/CMakeLists.txt @@ -9,6 +9,7 @@ vespa_add_library(fsamanagers singleton.cpp INSTALL lib64 DEPENDS + fsa ) find_package(Threads REQUIRED) target_link_libraries(fsamanagers PUBLIC ${CMAKE_THREAD_LIBS_INIT}) diff --git a/memfilepersistence/src/tests/CMakeLists.txt b/memfilepersistence/src/tests/CMakeLists.txt index 24863d6e837..f20871fdcec 100644 --- a/memfilepersistence/src/tests/CMakeLists.txt +++ b/memfilepersistence/src/tests/CMakeLists.txt @@ -9,6 +9,5 @@ vespa_add_executable(memfilepersistence_testrunner_app TEST memfilepersistence_testinit memfilepersistence_testspi memfilepersistence_testtools - memfilepersistence ) vespa_add_test(NAME memfilepersistence_testrunner_app COMMAND memfilepersistence_testrunner_app) diff --git a/memfilepersistence/src/tests/device/CMakeLists.txt b/memfilepersistence/src/tests/device/CMakeLists.txt index 845c70ae8e3..21f45aba6e8 100644 --- a/memfilepersistence/src/tests/device/CMakeLists.txt +++ b/memfilepersistence/src/tests/device/CMakeLists.txt @@ -7,4 +7,5 @@ vespa_add_library(memfilepersistence_testdevices devicemappertest.cpp partitionmonitortest.cpp DEPENDS + memfilepersistence ) diff --git a/memfilepersistence/src/tests/init/CMakeLists.txt b/memfilepersistence/src/tests/init/CMakeLists.txt index ebc4738a8c4..db50e017c08 100644 --- a/memfilepersistence/src/tests/init/CMakeLists.txt +++ b/memfilepersistence/src/tests/init/CMakeLists.txt @@ -3,4 +3,5 @@ vespa_add_library(memfilepersistence_testinit SOURCES filescannertest.cpp DEPENDS + memfilepersistence ) diff --git a/memfilepersistence/src/tests/spi/CMakeLists.txt b/memfilepersistence/src/tests/spi/CMakeLists.txt index d5dade96f57..a613e4b235e 100644 --- a/memfilepersistence/src/tests/spi/CMakeLists.txt +++ b/memfilepersistence/src/tests/spi/CMakeLists.txt @@ -17,4 +17,5 @@ vespa_add_library(memfilepersistence_testspi buffered_file_writer_test.cpp buffer_test.cpp DEPENDS + memfilepersistence ) diff --git a/memfilepersistence/src/tests/tools/CMakeLists.txt b/memfilepersistence/src/tests/tools/CMakeLists.txt index aef718c7633..4a3b4fb3061 100644 --- a/memfilepersistence/src/tests/tools/CMakeLists.txt +++ b/memfilepersistence/src/tests/tools/CMakeLists.txt @@ -4,4 +4,6 @@ vespa_add_library(memfilepersistence_testtools dumpslotfiletest.cpp vdsdisktooltest.cpp DEPENDS + memfilepersistence_testspi + memfilepersistence ) diff --git a/persistence/src/tests/CMakeLists.txt b/persistence/src/tests/CMakeLists.txt index e547c4e72eb..934bc54eb9c 100644 --- a/persistence/src/tests/CMakeLists.txt +++ b/persistence/src/tests/CMakeLists.txt @@ -5,7 +5,5 @@ vespa_add_executable(persistence_testrunner_app TEST DEPENDS persistence_testdummyimpl persistence_testspi - persistence - persistence_persistence_conformancetest ) vespa_add_test(NAME persistence_testrunner_app COMMAND persistence_testrunner_app) diff --git a/persistence/src/tests/dummyimpl/CMakeLists.txt b/persistence/src/tests/dummyimpl/CMakeLists.txt index 66758e8a0b4..6dabdd628fd 100644 --- a/persistence/src/tests/dummyimpl/CMakeLists.txt +++ b/persistence/src/tests/dummyimpl/CMakeLists.txt @@ -3,12 +3,13 @@ vespa_add_library(persistence_testdummyimpl SOURCES dummyimpltest.cpp DEPENDS + persistence_persistence_conformancetest + persistence ) vespa_add_executable(persistence_dummypersistence_test_app TEST SOURCES dummypersistence_test.cpp DEPENDS persistence - persistence_persistence_conformancetest ) vespa_add_test(NAME persistence_dummypersistence_test_app COMMAND persistence_dummypersistence_test_app) diff --git a/persistence/src/tests/spi/CMakeLists.txt b/persistence/src/tests/spi/CMakeLists.txt index d23c9c44209..236c8da2795 100644 --- a/persistence/src/tests/spi/CMakeLists.txt +++ b/persistence/src/tests/spi/CMakeLists.txt @@ -3,4 +3,6 @@ vespa_add_library(persistence_testspi SOURCES clusterstatetest.cpp DEPENDS + persistence_persistence_conformancetest + persistence ) diff --git a/persistence/src/vespa/persistence/CMakeLists.txt b/persistence/src/vespa/persistence/CMakeLists.txt index a45ca2e25f4..e93eb012fd5 100644 --- a/persistence/src/vespa/persistence/CMakeLists.txt +++ b/persistence/src/vespa/persistence/CMakeLists.txt @@ -12,4 +12,6 @@ vespa_add_library(persistence_persistence_conformancetest $<TARGET_OBJECTS:persistence_conformancetest_lib> INSTALL lib64 DEPENDS + persistence + vdstestlib ) diff --git a/searchcorespi/src/tests/plugin/CMakeLists.txt b/searchcorespi/src/tests/plugin/CMakeLists.txt index 333f927c3d2..ee449a8a3ff 100644 --- a/searchcorespi/src/tests/plugin/CMakeLists.txt +++ b/searchcorespi/src/tests/plugin/CMakeLists.txt @@ -3,11 +3,13 @@ vespa_add_library(searchcorespi_tplugin SOURCES plugin.cpp DEPENDS + searchcorespi ) vespa_add_library(searchcorespi_illegal-plugin SOURCES empty.cpp DEPENDS + searchcorespi ) vespa_add_executable(searchcorespi_plugin_test_app TEST SOURCES diff --git a/searchlib/src/vespa/searchlib/test/CMakeLists.txt b/searchlib/src/vespa/searchlib/test/CMakeLists.txt index 1e0bcb67da6..0632e8a4a91 100644 --- a/searchlib/src/vespa/searchlib/test/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/test/CMakeLists.txt @@ -8,5 +8,6 @@ vespa_add_library(searchlib_test $<TARGET_OBJECTS:searchlib_test_fakedata> $<TARGET_OBJECTS:searchlib_searchlib_test_diskindex> DEPENDS + searchlib searchlib_searchlib_test_memoryindex ) diff --git a/searchlib/src/vespa/searchlib/uca/CMakeLists.txt b/searchlib/src/vespa/searchlib/uca/CMakeLists.txt index 7ff31f7c7a0..f8955bef1e0 100644 --- a/searchlib/src/vespa/searchlib/uca/CMakeLists.txt +++ b/searchlib/src/vespa/searchlib/uca/CMakeLists.txt @@ -5,6 +5,7 @@ vespa_add_library(searchlib_searchlib_uca ucafunctionnode.cpp INSTALL lib64 DEPENDS + searchlib icui18n icuuc ) diff --git a/storageframework/src/tests/CMakeLists.txt b/storageframework/src/tests/CMakeLists.txt index 47a0a7bcc6e..d96113597fd 100644 --- a/storageframework/src/tests/CMakeLists.txt +++ b/storageframework/src/tests/CMakeLists.txt @@ -7,6 +7,5 @@ vespa_add_executable(storageframework_testrunner_app TEST storageframework_teststatus storageframework_testmemory storageframework_testthread - storageframework ) vespa_add_test(NAME storageframework_testrunner_app COMMAND storageframework_testrunner_app) diff --git a/storageframework/src/tests/clock/CMakeLists.txt b/storageframework/src/tests/clock/CMakeLists.txt index 1134cf8e88a..58b3c81d6eb 100644 --- a/storageframework/src/tests/clock/CMakeLists.txt +++ b/storageframework/src/tests/clock/CMakeLists.txt @@ -3,4 +3,5 @@ vespa_add_library(storageframework_testclock SOURCES timetest.cpp DEPENDS + storageframework ) diff --git a/storageframework/src/tests/memory/CMakeLists.txt b/storageframework/src/tests/memory/CMakeLists.txt index 97a7314f4cb..0905ce19aca 100644 --- a/storageframework/src/tests/memory/CMakeLists.txt +++ b/storageframework/src/tests/memory/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_library(storageframework_testmemory memorymanagertest.cpp memorystatetest.cpp DEPENDS + storageframework ) diff --git a/storageframework/src/tests/status/CMakeLists.txt b/storageframework/src/tests/status/CMakeLists.txt index 2c829d48810..7b1cefec6ad 100644 --- a/storageframework/src/tests/status/CMakeLists.txt +++ b/storageframework/src/tests/status/CMakeLists.txt @@ -3,4 +3,5 @@ vespa_add_library(storageframework_teststatus SOURCES htmlstatustest.cpp DEPENDS + storageframework ) diff --git a/storageframework/src/tests/thread/CMakeLists.txt b/storageframework/src/tests/thread/CMakeLists.txt index 961b49d065a..904a0441c99 100644 --- a/storageframework/src/tests/thread/CMakeLists.txt +++ b/storageframework/src/tests/thread/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_library(storageframework_testthread tickingthreadtest.cpp taskthreadtest.cpp DEPENDS + storageframework ) diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/CMakeLists.txt b/storageframework/src/vespa/storageframework/defaultimplementation/CMakeLists.txt index 51e992b134d..e0eafa63872 100644 --- a/storageframework/src/vespa/storageframework/defaultimplementation/CMakeLists.txt +++ b/storageframework/src/vespa/storageframework/defaultimplementation/CMakeLists.txt @@ -7,4 +7,5 @@ vespa_add_library(storageframework_defaultimplementation $<TARGET_OBJECTS:storageframework_threadimpl> INSTALL lib64 DEPENDS + storageframework_generic ) diff --git a/vdslib/src/tests/CMakeLists.txt b/vdslib/src/tests/CMakeLists.txt index b5af2f05501..d2b00ce8e70 100644 --- a/vdslib/src/tests/CMakeLists.txt +++ b/vdslib/src/tests/CMakeLists.txt @@ -7,6 +7,5 @@ vespa_add_executable(vdslib_testrunner_app TEST vdslib_testdistribution vdslib_teststate vdslib_testthread - vdslib ) vespa_add_test(NAME vdslib_testrunner_app COMMAND vdslib_testrunner_app) diff --git a/vdslib/src/tests/bucketdistribution/CMakeLists.txt b/vdslib/src/tests/bucketdistribution/CMakeLists.txt index 511a791d924..ca4cf84f0fb 100644 --- a/vdslib/src/tests/bucketdistribution/CMakeLists.txt +++ b/vdslib/src/tests/bucketdistribution/CMakeLists.txt @@ -3,4 +3,5 @@ vespa_add_library(vdslib_bucketdistributiontest SOURCES bucketdistributiontest.cpp DEPENDS + vdslib ) diff --git a/vdslib/src/tests/container/CMakeLists.txt b/vdslib/src/tests/container/CMakeLists.txt index 887fa69ad4b..99717430c28 100644 --- a/vdslib/src/tests/container/CMakeLists.txt +++ b/vdslib/src/tests/container/CMakeLists.txt @@ -9,4 +9,5 @@ vespa_add_library(vdslib_containertest lruordertest.cpp indexedcontaineriteratortest.cpp DEPENDS + vdslib ) diff --git a/vdslib/src/tests/distribution/CMakeLists.txt b/vdslib/src/tests/distribution/CMakeLists.txt index f3804b8b1eb..a82cb3ddec1 100644 --- a/vdslib/src/tests/distribution/CMakeLists.txt +++ b/vdslib/src/tests/distribution/CMakeLists.txt @@ -6,4 +6,5 @@ vespa_add_library(vdslib_testdistribution idealnodecalculatorimpltest.cpp idealnodecalculatorcachetest.cpp DEPENDS + vdslib ) diff --git a/vdslib/src/tests/state/CMakeLists.txt b/vdslib/src/tests/state/CMakeLists.txt index fead8cd022b..33490374616 100644 --- a/vdslib/src/tests/state/CMakeLists.txt +++ b/vdslib/src/tests/state/CMakeLists.txt @@ -4,4 +4,5 @@ vespa_add_library(vdslib_teststate clusterstatetest.cpp nodestatetest.cpp DEPENDS + vdslib ) diff --git a/vdslib/src/tests/thread/CMakeLists.txt b/vdslib/src/tests/thread/CMakeLists.txt index 210ecae3440..a51d0c588f6 100644 --- a/vdslib/src/tests/thread/CMakeLists.txt +++ b/vdslib/src/tests/thread/CMakeLists.txt @@ -3,4 +3,5 @@ vespa_add_library(vdslib_testthread SOURCES taskschedulertest.cpp DEPENDS + vdslib ) diff --git a/vespalib/src/vespa/vespalib/eval/llvm/CMakeLists.txt b/vespalib/src/vespa/vespalib/eval/llvm/CMakeLists.txt index 78462a68282..238dceb4026 100644 --- a/vespalib/src/vespa/vespalib/eval/llvm/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/eval/llvm/CMakeLists.txt @@ -7,5 +7,6 @@ vespa_add_library(vespalib_vespalib_eval_llvm llvm_wrapper.cpp INSTALL lib64 DEPENDS + vespalib LLVM-3.4 ) diff --git a/vespalib/src/vespa/vespalib/tensor/CMakeLists.txt b/vespalib/src/vespa/vespalib/tensor/CMakeLists.txt index 93a9f724235..bb5896d0875 100644 --- a/vespalib/src/vespa/vespalib/tensor/CMakeLists.txt +++ b/vespalib/src/vespa/vespalib/tensor/CMakeLists.txt @@ -14,4 +14,5 @@ vespa_add_library(vespalib_vespalib_tensor $<TARGET_OBJECTS:vespalib_vespalib_tensor_simple> INSTALL lib64 DEPENDS + vespalib ) |