From 71cd5e279fa2bb11fb7b0d1ef729fda47221e173 Mon Sep 17 00:00:00 2001 From: Eugeny Kalishenko Date: Sun, 29 Nov 2015 13:55:10 +0300 Subject: [PATCH] Added static library construction --- CMakeLists.txt | 6 ++++++ tests/unit/map2/CMakeLists.txt | 1 + 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index ca2f58b8..a38007e7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,9 +10,12 @@ option(WITH_TESTS "Build unit tests" OFF) find_package(Threads REQUIRED) find_package(Boost COMPONENTS system thread REQUIRED) + include_directories(${Boost_INCLUDE_DIRS}) set(CDS_SHARED_LIBRARY ${PROJECT_NAME}) +set(CDS_STATIC_LIBRARY ${PROJECT_NAME}-s) + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INCLUDE_CURRENT_DIR ON) @@ -49,9 +52,12 @@ set(SOURCES src/hp_gc.cpp src/dllmain.cpp) add_library(${CDS_SHARED_LIBRARY} SHARED ${SOURCES}) +add_library(${CDS_STATIC_LIBRARY} STATIC ${SOURCES}) target_link_libraries(${CDS_SHARED_LIBRARY} PRIVATE ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) +target_link_libraries(${CDS_STATIC_LIBRARY} PRIVATE ${Boost_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}) install(TARGETS ${CDS_SHARED_LIBRARY} DESTINATION lib COMPONENT ${LIBRARIES_COMPONENT}) +install(TARGETS ${CDS_STATIC_LIBRARY} DESTINATION lib COMPONENT ${LIBRARIES_COMPONENT}) install(DIRECTORY ${CMAKE_SOURCE_DIR}/cds DESTINATION include COMPONENT ${HEADERS_COMPONENT}) if(WITH_TESTS) diff --git a/tests/unit/map2/CMakeLists.txt b/tests/unit/map2/CMakeLists.txt index 40150720..0637900e 100644 --- a/tests/unit/map2/CMakeLists.txt +++ b/tests/unit/map2/CMakeLists.txt @@ -25,6 +25,7 @@ set(CDSUNIT_MAP_SOURCES map_insfind_int_bronsonavltree.cpp map_insfind_int_cuckoo.cpp map_insfind_int_ellentree.cpp + map_insfind_int_feldmanhashmap.cpp map_insfind_int_michael.cpp map_insfind_int_skip.cpp map_insfind_int_split.cpp -- 2.34.1