[CI] Changed CMake scripts for tests

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index d27c6f51a60e0f99e59d06a1a08901a3beb375a0..6922caeeffce33d7851290dd3a6994f2a12f7b7d 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,6 +9,15 @@ include_directories(
     ${GTEST_INCLUDE_DIRS}
 )
 
+set(CDS_TEST_LIBRARIES
+    ${CDS_SHARED_LIBRARY}
+    ${GTEST_LIBRARY}
+    ${Boost_THREAD_LIBRARY}
+    ${Boost_SYSTEM_LIBRARY}
+    ${CMAKE_THREAD_LIBS_INIT}
+    ${EXTERNAL_SYSTEM_LIBS}
+)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DGTEST_LANG_CXX11") 
  
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/unit)

diff --git a/test/stress/freelist/CMakeLists.txt b/test/stress/freelist/CMakeLists.txt
index 32d549a25b88d3ecdbc42cabe17eb4b1adcdabe1..9ff83085fa18908008ad9c7ef3f1cd682f1e4bf1 100644 (file)
--- a/test/stress/freelist/CMakeLists.txt
+++ b/test/stress/freelist/CMakeLists.txt
@@ -11,12 +11,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_FREELIST_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/del3/CMakeLists.txt b/test/stress/map/del3/CMakeLists.txt
index 1e92695fa270cdd85ca2068afd5ae67e1759d78b..020b0ee326f36becc348008539c9f012272f1393 100644 (file)
--- a/test/stress/map/del3/CMakeLists.txt
+++ b/test/stress/map/del3/CMakeLists.txt
@@ -18,12 +18,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_DEL3_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/delodd/CMakeLists.txt b/test/stress/map/delodd/CMakeLists.txt
index c825e901065af3fe1a09e6d6c2e1aeb2dc4bf6bc..827a4f0818a94c553bd0a0cc78ef619192841043 100644 (file)
--- a/test/stress/map/delodd/CMakeLists.txt
+++ b/test/stress/map/delodd/CMakeLists.txt
@@ -18,12 +18,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_DELODD_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/find_string/CMakeLists.txt b/test/stress/map/find_string/CMakeLists.txt
index 784bec30231c39266f90954e16ad95c23c03cf50..d85eec81b5f1a45005833f71d7ad67b0409db806 100644 (file)
--- a/test/stress/map/find_string/CMakeLists.txt
+++ b/test/stress/map/find_string/CMakeLists.txt
@@ -20,12 +20,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_FIND_STRING_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/insdel_func/CMakeLists.txt b/test/stress/map/insdel_func/CMakeLists.txt
index f6a4e483ec00d752120a73ec8ab60034f5ceacdc..e9eec231161bc0b4798e0ad0b35d6d8616a9069f 100644 (file)
--- a/test/stress/map/insdel_func/CMakeLists.txt
+++ b/test/stress/map/insdel_func/CMakeLists.txt
@@ -19,12 +19,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_INSDEL_FUNC_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/insdel_item_int/CMakeLists.txt b/test/stress/map/insdel_item_int/CMakeLists.txt
index b3ea1bfe71299bf441159bf295677437db12412b..5f003bf075a841378f51a26a2e476a5db4220452 100644 (file)
--- a/test/stress/map/insdel_item_int/CMakeLists.txt
+++ b/test/stress/map/insdel_item_int/CMakeLists.txt
@@ -19,12 +19,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_INSDEL_ITEM_INT_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/insdel_string/CMakeLists.txt b/test/stress/map/insdel_string/CMakeLists.txt
index 1e7858f9036423883aaa468c5093d6006671539f..242baaaa7d1f74f5da40992ac6b834dffbaad0c2 100644 (file)
--- a/test/stress/map/insdel_string/CMakeLists.txt
+++ b/test/stress/map/insdel_string/CMakeLists.txt
@@ -20,12 +20,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_INSDEL_STRING_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/insdelfind/CMakeLists.txt b/test/stress/map/insdelfind/CMakeLists.txt
index c02765ee85a728135b06d6f1b6f445fdaced61c6..8a88ad27d8c5e0863788d143afb1bd0fd1d52485 100644 (file)
--- a/test/stress/map/insdelfind/CMakeLists.txt
+++ b/test/stress/map/insdelfind/CMakeLists.txt
@@ -20,12 +20,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_INSDELFIND_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/map/minmax/CMakeLists.txt b/test/stress/map/minmax/CMakeLists.txt
index adaf20312933045873a801b3cff460c33513073e..99c36699545655a0783b92193ae6848e2b2d2b1a 100644 (file)
--- a/test/stress/map/minmax/CMakeLists.txt
+++ b/test/stress/map/minmax/CMakeLists.txt
@@ -14,12 +14,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_MAP_MINMAX_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/pqueue/CMakeLists.txt b/test/stress/pqueue/CMakeLists.txt
index 7131a9841a1eb3927b369205925369e9b74e563b..e36115d26b13c2ffa97823c8a0c728998ccc16ac 100644 (file)
--- a/test/stress/pqueue/CMakeLists.txt
+++ b/test/stress/pqueue/CMakeLists.txt
@@ -14,12 +14,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_PQUEUE_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/queue/CMakeLists.txt b/test/stress/queue/CMakeLists.txt
index cca5e7b25511cda27e6bd3110474a586be7f972f..be5b0a5d9bbd48671b873cafd74861ab4573296b 100644 (file)
--- a/test/stress/queue/CMakeLists.txt
+++ b/test/stress/queue/CMakeLists.txt
@@ -15,12 +15,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_QUEUE_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/set/del3/CMakeLists.txt b/test/stress/set/del3/CMakeLists.txt
index 1ebfa49ebfed3da6ad0a5785beea52a915f0c2bb..48eaf233550634b3a7743dd07f3f12a039f4c0ed 100644 (file)
--- a/test/stress/set/del3/CMakeLists.txt
+++ b/test/stress/set/del3/CMakeLists.txt
@@ -17,12 +17,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_SET_DEL3_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/set/delodd/CMakeLists.txt b/test/stress/set/delodd/CMakeLists.txt
index b0b9e573044620bc6efb58359b0d031dc1d2e0e1..fab9dadbb8feabdc2c5420b44a0fb5c0411af51d 100644 (file)
--- a/test/stress/set/delodd/CMakeLists.txt
+++ b/test/stress/set/delodd/CMakeLists.txt
@@ -17,12 +17,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_SET_DELODD_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/set/insdel_find/CMakeLists.txt b/test/stress/set/insdel_find/CMakeLists.txt
index 5c8b0d649a5af6294a5c4b9a9028f4d0b44f0feb..15f7aa739942905592fb85f2a1dce2ab5a5dff75 100644 (file)
--- a/test/stress/set/insdel_find/CMakeLists.txt
+++ b/test/stress/set/insdel_find/CMakeLists.txt
@@ -19,12 +19,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_SET_INSDELFIND_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/set/insdel_func/CMakeLists.txt b/test/stress/set/insdel_func/CMakeLists.txt
index 13c2b2c0e61783ace2757eaa5c7fba0c2807e5ab..22fb5fd65a923476ca44b481fd13ada9b06173c1 100644 (file)
--- a/test/stress/set/insdel_func/CMakeLists.txt
+++ b/test/stress/set/insdel_func/CMakeLists.txt
@@ -18,12 +18,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_SET_INSDEL_FUNC_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/set/insdel_string/CMakeLists.txt b/test/stress/set/insdel_string/CMakeLists.txt
index 0b557e35d6e0156f1b2e0ef6bc2eeef4b116ca8b..84212ff7da77ef10fc11e22858946e63c0bdff2e 100644 (file)
--- a/test/stress/set/insdel_string/CMakeLists.txt
+++ b/test/stress/set/insdel_string/CMakeLists.txt
@@ -19,12 +19,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_SET_INSDEL_STRING_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/set/iteration/CMakeLists.txt b/test/stress/set/iteration/CMakeLists.txt
index e17c6084a624ca8235f4585b5480e37b60a3ea8f..b49ca6acad4f98984890b6a7b5b6316acc445c13 100644 (file)
--- a/test/stress/set/iteration/CMakeLists.txt
+++ b/test/stress/set/iteration/CMakeLists.txt
@@ -13,12 +13,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_SET_ITERATION_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/stress/stack/CMakeLists.txt b/test/stress/stack/CMakeLists.txt
index 1d1dc5f76a6c9bca95c552ff8ba1a34e0b360ccd..af5e8c08db290790b35abd5273fde7b49bf77c04 100644 (file)
--- a/test/stress/stack/CMakeLists.txt
+++ b/test/stress/stack/CMakeLists.txt
@@ -13,12 +13,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSSTRESS_STACK_SOURCES} $<TARGET_OBJECTS:${CDSSTRESS_FRAMEWORK_LIBRARY}>)
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/deque/CMakeLists.txt b/test/unit/deque/CMakeLists.txt
index 462d6c6ecd1f92341b73b621efa70c6f08444bde..cf8fb8076aa66b3212a7d791352385a846c8da6f 100644 (file)
--- a/test/unit/deque/CMakeLists.txt
+++ b/test/unit/deque/CMakeLists.txt
@@ -10,12 +10,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_DEQUE_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/intrusive-list/CMakeLists.txt b/test/unit/intrusive-list/CMakeLists.txt
index d4d950dbc6879454253bb00b4665a1d0e4140a6c..36e098ea8724bcad5d398dd1e67d3eeb8aac06eb 100644 (file)
--- a/test/unit/intrusive-list/CMakeLists.txt
+++ b/test/unit/intrusive-list/CMakeLists.txt
@@ -16,13 +16,8 @@ set(UNIT_ILIST_MICHAEL_SOURCES
     intrusive_michael_rcu_sht.cpp
 )
 add_executable(${UNIT_ILIST_MICHAEL} ${UNIT_ILIST_MICHAEL_SOURCES})
-target_link_libraries(${UNIT_ILIST_MICHAEL} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ILIST_MICHAEL} ${CDS_TEST_LIBRARIES})
+
 add_test(NAME ${UNIT_ILIST_MICHAEL} COMMAND ${UNIT_ILIST_MICHAEL} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::LazyList

diff --git a/test/unit/intrusive-set/CMakeLists.txt b/test/unit/intrusive-set/CMakeLists.txt
index 90e02ec0aef50ecb1a504c724706be8655f3797b..a60d137bed02c8d0e1f1d1c9d6919caaaaec5aeb 100644 (file)
--- a/test/unit/intrusive-set/CMakeLists.txt
+++ b/test/unit/intrusive-set/CMakeLists.txt
@@ -17,13 +17,8 @@ set(UNIT_ISET_FELDMAN_SOURCES
     intrusive_feldman_hashset_rcu_sht.cpp
 )
 add_executable(${UNIT_ISET_FELDMAN} ${UNIT_ISET_FELDMAN_SOURCES})
-target_link_libraries(${UNIT_ISET_FELDMAN} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_ISET_FELDMAN} ${CDS_TEST_LIBRARIES})
+
 add_test(NAME ${UNIT_ISET_FELDMAN} COMMAND ${UNIT_ISET_FELDMAN} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # intrusive::MichaelHashSet<MichaelList>

diff --git a/test/unit/list/CMakeLists.txt b/test/unit/list/CMakeLists.txt
index 41720e3fb671869244c728c6e1935d60ed0690d6..32c3ed44a81d19f6f9ff2904ad3630683426a87a 100644 (file)
--- a/test/unit/list/CMakeLists.txt
+++ b/test/unit/list/CMakeLists.txt
@@ -12,13 +12,8 @@ set(UNIT_LIST_ITERABLE_SOURCES
     kv_iterable_dhp.cpp
 )
 add_executable(${UNIT_LIST_ITERABLE} ${UNIT_LIST_ITERABLE_SOURCES})
-target_link_libraries(${UNIT_LIST_ITERABLE} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_LIST_ITERABLE} ${CDS_TEST_LIBRARIES})
+
 add_test(NAME ${UNIT_LIST_ITERABLE} COMMAND ${UNIT_LIST_ITERABLE} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # LazyList

diff --git a/test/unit/map/CMakeLists.txt b/test/unit/map/CMakeLists.txt
index 717ef208446de3a1dbd253a5d64bf6f96b2cc646..e6fa0347f2eb5ac0853abd64af7ca1e2db85435c 100644 (file)
--- a/test/unit/map/CMakeLists.txt
+++ b/test/unit/map/CMakeLists.txt
@@ -15,13 +15,8 @@ set(UNIT_MAP_FELDMAN_SOURCES
     feldman_hashset_rcu_sht.cpp
 )
 add_executable(${UNIT_MAP_FELDMAN} ${UNIT_MAP_FELDMAN_SOURCES})
-target_link_libraries(${UNIT_MAP_FELDMAN}
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${UNIT_MAP_FELDMAN} ${CDS_TEST_LIBRARIES})
+
 add_test(NAME ${UNIT_MAP_FELDMAN} COMMAND ${UNIT_MAP_FELDMAN} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
 
 # MichaelHashMap<MichaelList> unit test

diff --git a/test/unit/misc/CMakeLists.txt b/test/unit/misc/CMakeLists.txt
index e533d2a457456f8cb944e55b04287c7723fbe7d1..3b953ac3fd4f73d06d1f955feaa01dae946c8ca1 100644 (file)
--- a/test/unit/misc/CMakeLists.txt
+++ b/test/unit/misc/CMakeLists.txt
@@ -16,12 +16,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_MISC_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/pqueue/CMakeLists.txt b/test/unit/pqueue/CMakeLists.txt
index e276dfd99094c70d57bdbb19516cc0356ebf5719..95a22191b23cfa5d8bb90a80093e271469d04ec6 100644 (file)
--- a/test/unit/pqueue/CMakeLists.txt
+++ b/test/unit/pqueue/CMakeLists.txt
@@ -14,12 +14,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_PQUEUE_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/queue/CMakeLists.txt b/test/unit/queue/CMakeLists.txt
index 1c5ece953db7e4a11fc1b2af8d3376eed951af83..626ef727e4720c301ab0498437d10b8bd7486237 100644 (file)
--- a/test/unit/queue/CMakeLists.txt
+++ b/test/unit/queue/CMakeLists.txt
@@ -34,12 +34,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_QUEUE_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/set/CMakeLists.txt b/test/unit/set/CMakeLists.txt
index 130f016f253aeef3fc7cbb7afc4bdd600b0feb0f..85d18c25edd50fd529bf08f6134812eb157d6872 100644 (file)
--- a/test/unit/set/CMakeLists.txt
+++ b/test/unit/set/CMakeLists.txt
@@ -15,13 +15,8 @@ set(UNIT_SET_FELDMAN_SOURCES
     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>

diff --git a/test/unit/stack/CMakeLists.txt b/test/unit/stack/CMakeLists.txt
index cde5c67e8e34115780926ebb73110a8ab211858f..2a35488cc02cca056d0016ea18039c23e21ec142 100644 (file)
--- a/test/unit/stack/CMakeLists.txt
+++ b/test/unit/stack/CMakeLists.txt
@@ -15,12 +15,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_STACK_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/striped-map/CMakeLists.txt b/test/unit/striped-map/CMakeLists.txt
index 6b1ddc5fbc13a54fcc808f3cf42443706cf84aed..98a1d5f17629a7377ab2e577d20b91e2fc49e65a 100644 (file)
--- a/test/unit/striped-map/CMakeLists.txt
+++ b/test/unit/striped-map/CMakeLists.txt
@@ -20,12 +20,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_STRIPED_MAP_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/striped-set/CMakeLists.txt b/test/unit/striped-set/CMakeLists.txt
index fa30a1e030bbd28ba3c552ee5ad7045a0b47f842..228bab1b496985a8802251069204302c4c50495e 100644 (file)
--- a/test/unit/striped-set/CMakeLists.txt
+++ b/test/unit/striped-set/CMakeLists.txt
@@ -32,12 +32,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_SET_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file

diff --git a/test/unit/tree/CMakeLists.txt b/test/unit/tree/CMakeLists.txt
index c332e7708810edc1fe23e4c1d6448f18f170a1db..95e69535ca1a9540b020c4685849ebb884b706b7 100644 (file)
--- a/test/unit/tree/CMakeLists.txt
+++ b/test/unit/tree/CMakeLists.txt
@@ -43,12 +43,6 @@ include_directories(
 )
 
 add_executable(${PACKAGE_NAME} ${CDSGTEST_TREE_SOURCES})
-target_link_libraries(${PACKAGE_NAME} 
-    ${CDS_SHARED_LIBRARY}
-    ${GTEST_LIBRARY}
-    ${Boost_THREAD_LIBRARY}
-    ${Boost_SYSTEM_LIBRARY}
-    ${CMAKE_THREAD_LIBS_INIT}
-)
+target_link_libraries(${PACKAGE_NAME} ${CDS_TEST_LIBRARIES})
 
 add_test(NAME ${PACKAGE_NAME} COMMAND ${PACKAGE_NAME} WORKING_DIRECTORY ${EXECUTABLE_OUTPUT_PATH})
\ No newline at end of file