X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Flibhashkit%2FCMakeLists.txt;h=1a03de2365f25a72eafa7882d913be7352b974d7;hb=d180295a76d7e43b357765a8a6434fdf5f7d3abd;hp=08c4835101bb242612659c70cc70cb68f7dfa56b;hpb=5e760300d15ef4c5b7eed3fb9f37920ebca2f6ec;p=awesomized%2Flibmemcached

diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt
index 08c48351..1a03de23 100644
--- a/src/libhashkit/CMakeLists.txt
+++ b/src/libhashkit/CMakeLists.txt
@@ -1,13 +1,7 @@
-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
         encrypt.cc
@@ -16,14 +10,12 @@ add_library(libhashkit SHARED
         function.cc
         has.cc
         hashkit.cc
-        ${HSIEH_CC}
+        hsieh.cc
         jenkins.cc
-        ketama.cc
         md5.cc
         murmur.cc
         murmur3.cc
         murmur3_api.cc
-        nohsieh.cc
         one_at_a_time.cc
         rijndael.cc
         str_algorithm.cc
@@ -31,17 +23,34 @@ add_library(libhashkit SHARED
         string.cc
         )
 add_library(hashkit ALIAS libhashkit)
-set_target_properties(libhashkit PROPERTIES LIBRARY_OUTPUT_NAME hashkit)
+set_target_properties(libhashkit PROPERTIES
+        CXX_STANDARD ${CXX_STANDARD}
+        LIBRARY_OUTPUT_NAME hashkit
+        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
+        ${CMAKE_BINARY_DIR}/src
+        ${CMAKE_BINARY_DIR})
+target_include_directories(libhashkit PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>
+        $<BUILD_INTERFACE:${CMAKE_BINARY_DIR}/include>
+        $<INSTALL_INTERFACE:include>)
 configure_file(hashkitcon.h.in hashkitcon.h @ONLY)
 
-set_target_properties(libhashkit PROPERTIES SOVERSION ${LIBHASHKIT_SO_VERSION})
-install(TARGETS libhashkit EXPORT libhashkit
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-export(EXPORT libhashkit)
-install(EXPORT libhashkit DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-        FILES_MATCHING PATTERN hashkit.h
+install(TARGETS libhashkit EXPORT libhashkit-targets
+        LIBRARY
+        COMPONENT lib
+        ${TARGET_NAMELINK_COMPONENT}
+        DESTINATION ${CMAKE_INSTALL_LIBDIR})
+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
+
+        hashkit.h
         )