Skip to content

Commit 0099dc2

Browse files
committed
fixed the build routines
1 parent c9fd02b commit 0099dc2

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

cachelib/allocator/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ if (BUILD_TESTS)
8181
${DATASTRUCT_TESTS_THRIFT_FILES}
8282
./nvmcache/tests/NvmTestBase.cpp
8383
./memory/tests/TestBase.cpp
84-
../common/TestUtils.cpp
8584
)
8685
add_dependencies(allocator_test_support thrift_generated_files)
8786
target_link_libraries (allocator_test_support PUBLIC

cachelib/benchmarks/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ add_thrift_file(DATATYPEBENCH DataTypeBench.thrift frozen2)
1717
if (BUILD_TESTS)
1818
add_library (benchmark_test_support
1919
${DATATYPEBENCH_THRIFT_FILES}
20-
../common/TestUtils.cpp
2120
)
2221

2322
add_dependencies(benchmark_test_support thrift_generated_files)

cachelib/common/CMakeLists.txt

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,28 @@ install(TARGETS cachelib_common
4747

4848

4949
if (BUILD_TESTS)
50-
add_library (common_test_support INTERFACE)
51-
target_link_libraries (common_test_support INTERFACE
50+
add_library (common_test_utils STATIC
51+
TestUtils.cpp
52+
)
53+
target_link_libraries (common_test_utils PUBLIC
5254
cachelib_common
53-
common_test_utils
5455
gflags
5556
GTest::gtest
5657
GTest::gtest_main
5758
)
58-
target_sources(common_test_support INTERFACE
59-
TestUtils.cpp
59+
60+
add_library (common_test_support OBJECT
6061
hothash/HotHashDetectorTest.cpp
6162
piecewise/GenericPiecesTest.cpp
62-
piecewise/RequestRangeTest.cpp)
63+
piecewise/RequestRangeTest.cpp
64+
)
65+
target_link_libraries (common_test_support PUBLIC
66+
cachelib_common
67+
common_test_utils
68+
gflags
69+
GTest::gtest
70+
GTest::gtest_main
71+
)
6372

6473
function (ADD_TEST SOURCE_FILE)
6574
# Add any additional libraries BEFORE the "common_test_support" to ensure

cachelib/compact_cache/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,9 @@ if (BUILD_TESTS)
2323
GTest::gtest
2424
GTest::gmock
2525
)
26-
target_sources(compact_cache_test_support INTERFACE ../common/TestUtils.cpp)
2726

2827
function (ADD_TEST SOURCE_FILE)
29-
generic_add_test("compact-cache-test" "${SOURCE_FILE}"
28+
generic_add_test("compact-cache-test" "${SOURCE_FILE}"
3029
compact_cache_test_support "${ARGN}")
3130
endfunction()
3231

0 commit comments

Comments
 (0)