projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
cmake: clean up nohsieh.cc
[m6w6/libmemcached]
/
src
/
libhashkit
/
CMakeLists.txt
diff --git
a/src/libhashkit/CMakeLists.txt
b/src/libhashkit/CMakeLists.txt
index a75e08e7a6095cdc5ffdaac1bb9919aec89ded9c..3b4551dbd1f3e5698b60fed5af987a7bbd0626bf 100644
(file)
--- 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
add_library(libhashkit SHARED
aes.cc
algorithm.cc
- behavior.cc
common.h
crc32.cc
digest.cc
common.h
crc32.cc
digest.cc
@@
-17,9
+10,8
@@
add_library(libhashkit SHARED
function.cc
has.cc
hashkit.cc
function.cc
has.cc
hashkit.cc
- ${HSIEH_CC}
+ hsieh.cc
jenkins.cc
jenkins.cc
- ketama.cc
md5.cc
murmur.cc
murmur3.cc
md5.cc
murmur.cc
murmur3.cc
@@
-31,7
+23,12
@@
add_library(libhashkit SHARED
string.cc
)
add_library(hashkit ALIAS libhashkit)
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}
+ VERSION v${LIBHASHKIT_VERSION})
target_compile_options(libhashkit PRIVATE -DBUILDING_HASHKIT)
target_include_directories(libhashkit PRIVATE
${CMAKE_SOURCE_DIR}/src
target_compile_options(libhashkit PRIVATE -DBUILDING_HASHKIT)
target_include_directories(libhashkit PRIVATE
${CMAKE_SOURCE_DIR}/src
@@
-43,11
+40,10
@@
target_include_directories(libhashkit PUBLIC
$<INSTALL_INTERFACE:include>)
configure_file(hashkitcon.h.in hashkitcon.h @ONLY)
$<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})
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
install_public_headers(
libhashkit