Added static library construction

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca2f58b84789d9781e005ea1ebfe58e6f5618c7d..a38007e70093e2278793d4a8b6eff2dc8fcd8c4a 100644 (file)
--- 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)
 
 find_package(Threads REQUIRED)
 find_package(Boost COMPONENTS system thread REQUIRED)

+

 include_directories(${Boost_INCLUDE_DIRS})
 
 set(CDS_SHARED_LIBRARY ${PROJECT_NAME})
 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)
 
 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})
             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_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_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)
 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 4015072060dec7b90d844bd67ee324739138d005..0637900ee732213ca997474293fdeb9b19c5fa89 100644 (file)
--- 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_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
     map_insfind_int_michael.cpp
     map_insfind_int_skip.cpp
     map_insfind_int_split.cpp