X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibhashkit%2FCMakeLists.txt;h=ae57244f00e60ff3b8a65c98a644e74752ec93e3;hb=3ffc968aaf182bf1ff1e18157c7bde2bdb41668d;hp=f4657b6152a518ecf049ed74aabe1d9f027da19b;hpb=f0718ff0a0d9f807ac98bbc8f028ba2f1c1c3577;p=m6w6%2Flibmemcached

diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt
index f4657b61..ae57244f 100644
--- a/src/libhashkit/CMakeLists.txt
+++ b/src/libhashkit/CMakeLists.txt
@@ -1,13 +1,6 @@
-if(HAVE_HSIEH_HASH)
-    set(HSIEH_CC hsieh.cc)
-else()
-    set(HSIEH_CC nohsieh.cc)
-endif()
-
 add_library(libhashkit SHARED
         aes.cc
         algorithm.cc
-        behavior.cc
         common.h
         crc32.cc
         digest.cc
@@ -17,9 +10,8 @@ add_library(libhashkit SHARED
         function.cc
         has.cc
         hashkit.cc
-        ${HSIEH_CC}
+        hsieh.cc
         jenkins.cc
-        ketama.cc
         md5.cc
         murmur.cc
         murmur3.cc
@@ -32,10 +24,10 @@ add_library(libhashkit SHARED
         )
 add_library(hashkit ALIAS libhashkit)
 set_target_properties(libhashkit PROPERTIES
+        CXX_STANDARD ${CXX_STANDARD}
         LIBRARY_OUTPUT_NAME hashkit
-        INSTALL_RPATH $ORIGIN
-        SOVERSION ${LIBHASHKIT_SO_VERSION}
-        VERSION v${LIBHASHKIT_VERSION})
+        LIBRARY_OUTPUT_NAME_DEBUG hashkit-dbg
+        SOVERSION ${LIBHASHKIT_SO_VERSION})
 target_compile_options(libhashkit PRIVATE -DBUILDING_HASHKIT)
 target_include_directories(libhashkit PRIVATE
         ${CMAKE_SOURCE_DIR}/src
@@ -47,10 +39,16 @@ target_include_directories(libhashkit PUBLIC
         $<INSTALL_INTERFACE:include>)
 configure_file(hashkitcon.h.in hashkitcon.h @ONLY)
 
-install(TARGETS libhashkit EXPORT libhashkit
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-export(EXPORT libhashkit)
-install(EXPORT libhashkit DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+install(TARGETS libhashkit EXPORT libhashkit-targets
+        RUNTIME COMPONENT bin DESTINATION ${CMAKE_INSTALL_BINDIR}
+        ARCHIVE COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY COMPONENT lib DESTINATION ${CMAKE_INSTALL_LIBDIR}
+        ${TARGET_NAMELINK_COMPONENT}
+        )
+export(EXPORT libhashkit-targets NAMESPACE libmemcached::)
+install(EXPORT libhashkit-targets NAMESPACE libmemcached::
+        COMPONENT dev
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
 
 install_public_headers(
         libhashkit