Merge branch 'runtest' into v1.x

[awesomized/libmemcached] / src / libhashkit / CMakeLists.txt

diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt
index d31a54909b7b9edbce6d0d4c2b3c45bd92920115..daeec57b9123aa7087b4e7c98368dca0792a88de 100644 (file)
--- a/src/libhashkit/CMakeLists.txt
+++ b/src/libhashkit/CMakeLists.txt
@@ -7,7 +7,6 @@ endif()
 add_library(libhashkit SHARED
         aes.cc
         algorithm.cc
-        behavior.cc
         common.h
         crc32.cc
         digest.cc
@@ -19,7 +18,6 @@ add_library(libhashkit SHARED
         hashkit.cc
         ${HSIEH_CC}
         jenkins.cc
-        ketama.cc
         md5.cc
         murmur.cc
         murmur3.cc
@@ -31,16 +29,26 @@ 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
+        LIBRARY_OUTPUT_NAME hashkit
+        LIBRARY_OUTPUT_NAME_DEBUG hashkit-dbg
+        SOVERSION ${LIBHASHKIT_SO_VERSION}
+        VERSION v${LIBHASHKIT_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
+install(TARGETS libhashkit EXPORT libhashkit-targets
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-export(EXPORT libhashkit)
-install(EXPORT libhashkit DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+export(EXPORT libhashkit-targets NAMESPACE libmemcached::)
+install(EXPORT libhashkit-targets NAMESPACE libmemcached:: DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
 
 install_public_headers(
         libhashkit