Changed target name

[libcds.git] / test / unit / set / CMakeLists.txt

diff --git a/test/unit/set/CMakeLists.txt b/test/unit/set/CMakeLists.txt
index 130f016f253aeef3fc7cbb7afc4bdd600b0feb0f..0487d66170c5bb98e46a3891d2dda77b66ae0273 100644 (file)
--- a/test/unit/set/CMakeLists.txt
+++ b/test/unit/set/CMakeLists.txt
@@ -12,20 +12,14 @@ set(UNIT_SET_FELDMAN_SOURCES
     feldman_hashset_rcu_gpi.cpp
     feldman_hashset_rcu_gpt.cpp
     feldman_hashset_rcu_shb.cpp
-    feldman_hashset_rcu_sht.cpp
 )
 add_executable(${UNIT_SET_FELDMAN} ${UNIT_SET_FELDMAN_SOURCES})
-target_link_libraries(${UNIT_SET_FELDMAN} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_SET_FELDMAN} ${CDS_TEST_LIBRARIES})
+
 add_test(NAME ${UNIT_SET_FELDMAN} COMMAND ${UNIT_SET_FELDMAN} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # MichaelSet<MichaelList>
-set(UNIT_SET_MICHAEL unit-set-michael)
+set(UNIT_SET_MICHAEL unit-set-michael-michael)
 set(UNIT_SET_MICHAEL_SOURCES
     ../main.cpp
     michael_michael_hp.cpp
@@ -35,16 +29,9 @@ set(UNIT_SET_MICHAEL_SOURCES
     michael_michael_rcu_gpi.cpp
     michael_michael_rcu_gpt.cpp
     michael_michael_rcu_shb.cpp
-    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>
@@ -55,13 +42,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>
@@ -75,16 +56,9 @@ set(UNIT_SET_MICHAEL_LAZY_SOURCES
     michael_lazy_rcu_gpi.cpp
     michael_lazy_rcu_gpt.cpp
     michael_lazy_rcu_shb.cpp
-    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
@@ -98,16 +72,9 @@ set(UNIT_SET_SKIP_SOURCES
     skiplist_rcu_gpi.cpp
     skiplist_rcu_gpt.cpp
     skiplist_rcu_shb.cpp
-    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>
@@ -121,16 +88,9 @@ set(UNIT_SET_SPLIT_MICHAEL_SOURCES
     split_michael_rcu_gpi.cpp
     split_michael_rcu_gpt.cpp
     split_michael_rcu_shb.cpp
-    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>
@@ -144,16 +104,9 @@ set(UNIT_SET_SPLIT_LAZY_SOURCES
     split_lazy_rcu_gpi.cpp
     split_lazy_rcu_gpt.cpp
     split_lazy_rcu_shb.cpp
-    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>
@@ -164,13 +117,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})
 
 
@@ -180,7 +127,7 @@ add_custom_target( unit-set
         ${UNIT_SET_MICHAEL}
         ${UNIT_SET_MICHAEL_ITERABLE}
         ${UNIT_SET_MICHAEL_LAZY}
-        ${UNIT_SET_SKIP_LIST}
+        ${UNIT_SET_SKIP}
         ${UNIT_SET_SPLIT_MICHAEL}
         ${UNIT_SET_SPLIT_ITERABLE}
         ${UNIT_SET_SPLIT_LAZY}