From: khizmax Date: Mon, 20 Feb 2017 19:18:18 +0000 (+0300) Subject: [CI] Changed CMake scripts for tests X-Git-Tag: v2.3.0~166 X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ea9a682264dcb9106ff47f8940ab3a3372d52172;p=libcds.git [CI] Changed CMake scripts for tests --- diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index d27c6f51..6922caee 100644 --- 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 32d549a2..9ff83085 100644 --- 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_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 1e92695f..020b0ee3 100644 --- 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_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 c825e901..827a4f08 100644 --- 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_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 784bec30..d85eec81 100644 --- 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_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 f6a4e483..e9eec231 100644 --- 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_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 b3ea1bfe..5f003bf0 100644 --- 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_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 1e7858f9..242baaaa 100644 --- 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_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 c02765ee..8a88ad27 100644 --- 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_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 adaf2031..99c36699 100644 --- 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_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 7131a984..e36115d2 100644 --- 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_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 cca5e7b2..be5b0a5d 100644 --- 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_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 1ebfa49e..48eaf233 100644 --- 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_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 b0b9e573..fab9dadb 100644 --- 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_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 5c8b0d64..15f7aa73 100644 --- 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_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 13c2b2c0..22fb5fd6 100644 --- 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_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 0b557e35..84212ff7 100644 --- 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_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 e17c6084..b49ca6ac 100644 --- 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_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 1d1dc5f7..af5e8c08 100644 --- 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_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 462d6c6e..cf8fb807 100644 --- 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 d4d950db..36e098ea 100644 --- 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 90e02ec0..a60d137b 100644 --- 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 diff --git a/test/unit/list/CMakeLists.txt b/test/unit/list/CMakeLists.txt index 41720e3f..32c3ed44 100644 --- 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 717ef208..e6fa0347 100644 --- 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 unit test diff --git a/test/unit/misc/CMakeLists.txt b/test/unit/misc/CMakeLists.txt index e533d2a4..3b953ac3 100644 --- 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 e276dfd9..95a22191 100644 --- 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 1c5ece95..626ef727 100644 --- 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 130f016f..85d18c25 100644 --- 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 diff --git a/test/unit/stack/CMakeLists.txt b/test/unit/stack/CMakeLists.txt index cde5c67e..2a35488c 100644 --- 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 6b1ddc5f..98a1d5f1 100644 --- 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 fa30a1e0..228bab1b 100644 --- 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 c332e770..95e69535 100644 --- 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