[CI] Changed CMake scripts for tests

diff --git a/test/unit/intrusive-list/CMakeLists.txt b/test/unit/intrusive-list/CMakeLists.txt
index 36e098ea8724bcad5d398dd1e67d3eeb8aac06eb..5809034bc8dde5b012565593f43716db7dca16a5 100644 (file)
--- a/test/unit/intrusive-list/CMakeLists.txt
+++ b/test/unit/intrusive-list/CMakeLists.txt
@@ -34,13 +34,7 @@ set(UNIT_ILIST_LAZY_SOURCES
     intrusive_lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_ILIST_LAZY} ${UNIT_ILIST_LAZY_SOURCES})
-target_link_libraries(${UNIT_ILIST_LAZY} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ILIST_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ILIST_LAZY} COMMAND ${UNIT_ILIST_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::IterableList
@@ -51,13 +45,7 @@ set(UNIT_ILIST_ITERABLE_SOURCES
     intrusive_iterable_dhp.cpp
 )
 add_executable(${UNIT_ILIST_ITERABLE} ${UNIT_ILIST_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_ILIST_ITERABLE} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ILIST_ITERABLE} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ILIST_ITERABLE} COMMAND ${UNIT_ILIST_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 

diff --git a/test/unit/intrusive-set/CMakeLists.txt b/test/unit/intrusive-set/CMakeLists.txt
index a60d137bed02c8d0e1f1d1c9d6919caaaaec5aeb..777786a726e759fee30a96a3bbaa47c4d67f5975 100644 (file)
--- a/test/unit/intrusive-set/CMakeLists.txt
+++ b/test/unit/intrusive-set/CMakeLists.txt
@@ -35,13 +35,7 @@ set(UNIT_ISET_MICHAEL_SOURCES
     intrusive_michael_michael_rcu_sht.cpp
 )
 add_executable(${UNIT_ISET_MICHAEL} ${UNIT_ISET_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_ISET_MICHAEL} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_MICHAEL} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ISET_MICHAEL} COMMAND ${UNIT_ISET_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::MichaelHashSet<LazyList>
@@ -58,13 +52,7 @@ set(UNIT_ISET_MICHAEL_LAZY_SOURCES
     intrusive_michael_lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_ISET_MICHAEL_LAZY} ${UNIT_ISET_MICHAEL_LAZY_SOURCES})
-target_link_libraries(${UNIT_ISET_MICHAEL_LAZY} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_MICHAEL_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ISET_MICHAEL_LAZY} COMMAND ${UNIT_ISET_MICHAEL_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::MichaelHashSet<IterableList>
@@ -75,13 +63,7 @@ set(UNIT_ISET_MICHAEL_ITERABLE_SOURCES
     intrusive_michael_iterable_hp.cpp
 )
 add_executable(${UNIT_ISET_MICHAEL_ITERABLE} ${UNIT_ISET_MICHAEL_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_ISET_MICHAEL_ITERABLE} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_MICHAEL_ITERABLE} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ISET_MICHAEL_ITERABLE} COMMAND ${UNIT_ISET_MICHAEL_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::SkipListSet
@@ -98,13 +80,7 @@ set(UNIT_ISET_SKIP_SOURCES
     intrusive_skiplist_rcu_sht.cpp
 )
 add_executable(${UNIT_ISET_SKIP} ${UNIT_ISET_SKIP_SOURCES})
-target_link_libraries(${UNIT_ISET_SKIP} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_SKIP} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ISET_SKIP} COMMAND ${UNIT_ISET_SKIP} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::SplitListSet<MichaelList>
@@ -121,13 +97,7 @@ set(UNIT_ISET_SPLIT_MICHAEL_SOURCES
     intrusive_split_michael_rcu_sht.cpp
 )
 add_executable(${UNIT_ISET_SPLIT_MICHAEL} ${UNIT_ISET_SPLIT_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_ISET_SPLIT_MICHAEL} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_SPLIT_MICHAEL} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ISET_SPLIT_MICHAEL} COMMAND ${UNIT_ISET_SPLIT_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::SplitListSet<LazyList>
@@ -144,13 +114,7 @@ set(UNIT_ISET_SPLIT_LAZY_SOURCES
     intrusive_split_lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_ISET_SPLIT_LAZY} ${UNIT_ISET_SPLIT_LAZY_SOURCES})
-target_link_libraries(${UNIT_ISET_SPLIT_LAZY} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_SPLIT_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ISET_SPLIT_LAZY} COMMAND ${UNIT_ISET_SPLIT_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::SplitListSet<IterableList>
@@ -161,13 +125,7 @@ set(UNIT_ISET_SPLIT_ITERABLE_SOURCES
     intrusive_split_iterable_dhp.cpp
 )
 add_executable(${UNIT_ISET_SPLIT_ITERABLE} ${UNIT_ISET_SPLIT_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_ISET_SPLIT_ITERABLE} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_SPLIT_ITERABLE} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_ISET_SPLIT_ITERABLE} COMMAND ${UNIT_ISET_SPLIT_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 

diff --git a/test/unit/list/CMakeLists.txt b/test/unit/list/CMakeLists.txt
index 32c3ed44a81d19f6f9ff2904ad3630683426a87a..ca9a3036c9792dc796c13264b96b8cb199fefaf9 100644 (file)
--- a/test/unit/list/CMakeLists.txt
+++ b/test/unit/list/CMakeLists.txt
@@ -38,13 +38,7 @@ set(UNIT_LIST_LAZY_SOURCES
     lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_LIST_LAZY} ${UNIT_LIST_LAZY_SOURCES})
-target_link_libraries(${UNIT_LIST_LAZY} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_LIST_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_LIST_LAZY} COMMAND ${UNIT_LIST_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # MichaelList
@@ -69,13 +63,7 @@ set(UNIT_LIST_MICHAEL_SOURCES
     michael_rcu_sht.cpp
 )
 add_executable(${UNIT_LIST_MICHAEL} ${UNIT_LIST_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_LIST_MICHAEL} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_LIST_MICHAEL} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_LIST_MICHAEL} COMMAND ${UNIT_LIST_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 

diff --git a/test/unit/map/CMakeLists.txt b/test/unit/map/CMakeLists.txt
index e6fa0347f2eb5ac0853abd64af7ca1e2db85435c..df096742277f07a788b8d56f3e6903aeeeb7ef16 100644 (file)
--- a/test/unit/map/CMakeLists.txt
+++ b/test/unit/map/CMakeLists.txt
@@ -33,13 +33,8 @@ set(UNIT_MAP_MICHAEL_SOURCES
     michael_michael_rcu_sht.cpp
 )
 add_executable(${UNIT_MAP_MICHAEL} ${UNIT_MAP_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_MAP_MICHAEL}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_MICHAEL} ${CDS_TEST_LIBRARIES})
+
 add_test(NAME ${UNIT_MAP_MICHAEL} COMMAND ${UNIT_MAP_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # MichaelHashMap<IterableList> unit test
@@ -50,13 +45,8 @@ set(UNIT_MAP_MICHAEL_ITERABLE_SOURCES
     michael_iterable_dhp.cpp
 )
 add_executable(${UNIT_MAP_MICHAEL_ITERABLE} ${UNIT_MAP_MICHAEL_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_MAP_MICHAEL_ITERABLE}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_MICHAEL_ITERABLE} ${CDS_TEST_LIBRARIES})
+
 add_test(NAME ${UNIT_MAP_MICHAEL_ITERABLE} COMMAND ${UNIT_MAP_MICHAEL_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # MichaelHashMap<LazyList> unit test
@@ -73,13 +63,7 @@ set(UNIT_MAP_MICHAEL_LAZY_SOURCES
     michael_lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_MAP_MICHAEL_LAZY} ${UNIT_MAP_MICHAEL_LAZY_SOURCES})
-target_link_libraries(${UNIT_MAP_MICHAEL_LAZY}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_MICHAEL_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_MAP_MICHAEL_LAZY} COMMAND ${UNIT_MAP_MICHAEL_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SkipListMap unit test
@@ -96,13 +80,7 @@ set(UNIT_MAP_SKIP_LIST_SOURCES
     skiplist_rcu_sht.cpp
 )
 add_executable(${UNIT_MAP_SKIP_LIST} ${UNIT_MAP_SKIP_LIST_SOURCES})
-target_link_libraries(${UNIT_MAP_SKIP_LIST}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_SKIP_LIST} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_MAP_SKIP_LIST} COMMAND ${UNIT_MAP_SKIP_LIST} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SplitListMap<MichaelList> unit test
@@ -119,13 +97,7 @@ set(UNIT_MAP_SPLIT_MICHAEL_SOURCES
     split_michael_rcu_sht.cpp
 )
 add_executable(${UNIT_MAP_SPLIT_MICHAEL} ${UNIT_MAP_SPLIT_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_MAP_SPLIT_MICHAEL}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_SPLIT_MICHAEL} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_MAP_SPLIT_MICHAEL} COMMAND ${UNIT_MAP_SPLIT_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SplitListMap<IterableList> unit test
@@ -136,13 +108,7 @@ set(UNIT_MAP_SPLIT_ITERABLE_SOURCES
     split_iterable_dhp.cpp
 )
 add_executable(${UNIT_MAP_SPLIT_ITERABLE} ${UNIT_MAP_SPLIT_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_MAP_SPLIT_ITERABLE}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_SPLIT_ITERABLE} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_MAP_SPLIT_ITERABLE} COMMAND ${UNIT_MAP_SPLIT_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SplitListMap<LazyList> unit test
@@ -159,13 +125,7 @@ set(UNIT_MAP_SPLIT_LAZY_SOURCES
     split_lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_MAP_SPLIT_LAZY} ${UNIT_MAP_SPLIT_LAZY_SOURCES})
-target_link_libraries(${UNIT_MAP_SPLIT_LAZY}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_SPLIT_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_MAP_SPLIT_LAZY} COMMAND ${UNIT_MAP_SPLIT_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 

diff --git a/test/unit/set/CMakeLists.txt b/test/unit/set/CMakeLists.txt
index 85d18c25edd50fd529bf08f6134812eb157d6872..bc205c673e49c47958513e3e6ecdc91329505bc1 100644 (file)
--- a/test/unit/set/CMakeLists.txt
+++ b/test/unit/set/CMakeLists.txt
@@ -33,13 +33,7 @@ set(UNIT_SET_MICHAEL_SOURCES
     michael_michael_rcu_sht.cpp
 )
 add_executable(${UNIT_SET_MICHAEL} ${UNIT_SET_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_SET_MICHAEL} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_MICHAEL} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_SET_MICHAEL} COMMAND ${UNIT_SET_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # MichaelSet<IterableList>
@@ -50,13 +44,7 @@ set(UNIT_SET_MICHAEL_ITERABLE_SOURCES
     michael_iterable_dhp.cpp
 )
 add_executable(${UNIT_SET_MICHAEL_ITERABLE} ${UNIT_SET_MICHAEL_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_SET_MICHAEL_ITERABLE} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_MICHAEL_ITERABLE} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_SET_MICHAEL_ITERABLE} COMMAND ${UNIT_SET_MICHAEL_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # MichaelSet<LazyList>
@@ -73,13 +61,7 @@ set(UNIT_SET_MICHAEL_LAZY_SOURCES
     michael_lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_SET_MICHAEL_LAZY} ${UNIT_SET_MICHAEL_LAZY_SOURCES})
-target_link_libraries(${UNIT_SET_MICHAEL_LAZY} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_MICHAEL_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_SET_MICHAEL_LAZY} COMMAND ${UNIT_SET_MICHAEL_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SkipListSet
@@ -96,13 +78,7 @@ set(UNIT_SET_SKIP_SOURCES
     skiplist_rcu_sht.cpp
 )
 add_executable(${UNIT_SET_SKIP} ${UNIT_SET_SKIP_SOURCES})
-target_link_libraries(${UNIT_SET_SKIP} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_SKIP} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_SET_SKIP} COMMAND ${UNIT_SET_SKIP} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SplitListSet<MichaelList>
@@ -119,13 +95,7 @@ set(UNIT_SET_SPLIT_MICHAEL_SOURCES
     split_michael_rcu_sht.cpp
 )
 add_executable(${UNIT_SET_SPLIT_MICHAEL} ${UNIT_SET_SPLIT_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_SET_SPLIT_MICHAEL} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_SPLIT_MICHAEL} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_SET_SPLIT_MICHAEL} COMMAND ${UNIT_SET_SPLIT_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SplitListSet<LazyList>
@@ -142,13 +112,7 @@ set(UNIT_SET_SPLIT_LAZY_SOURCES
     split_lazy_rcu_sht.cpp
 )
 add_executable(${UNIT_SET_SPLIT_LAZY} ${UNIT_SET_SPLIT_LAZY_SOURCES})
-target_link_libraries(${UNIT_SET_SPLIT_LAZY} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_SPLIT_LAZY} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_SET_SPLIT_LAZY} COMMAND ${UNIT_SET_SPLIT_LAZY} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # SplitListSet<IterableList>
@@ -159,13 +123,7 @@ set(UNIT_SET_SPLIT_ITERABLE_SOURCES
     split_iterable_dhp.cpp
 )
 add_executable(${UNIT_SET_SPLIT_ITERABLE} ${UNIT_SET_SPLIT_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_SET_SPLIT_ITERABLE} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_SPLIT_ITERABLE} ${CDS_TEST_LIBRARIES})
 add_test(NAME ${UNIT_SET_SPLIT_ITERABLE} COMMAND ${UNIT_SET_SPLIT_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})