projects
/
awesomized
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
fix soname versioning as suggested in #98
[awesomized/libmemcached]
/
src
/
libhashkit
/
CMakeLists.txt
diff --git
a/src/libhashkit/CMakeLists.txt
b/src/libhashkit/CMakeLists.txt
index ffe4026b69bf4d48e81c06bfad0e974652e48386..81129ef76873424c741701808d6ba03410438214 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
@@
-32,10
+24,11
@@
add_library(libhashkit SHARED
)
add_library(hashkit ALIAS libhashkit)
set_target_properties(libhashkit PROPERTIES
)
add_library(hashkit ALIAS libhashkit)
set_target_properties(libhashkit PROPERTIES
+ CXX_STANDARD ${CXX_STANDARD}
LIBRARY_OUTPUT_NAME hashkit
LIBRARY_OUTPUT_NAME_DEBUG hashkit-dbg
LIBRARY_OUTPUT_NAME hashkit
LIBRARY_OUTPUT_NAME_DEBUG hashkit-dbg
- SOVERSION ${LIBHASHKIT_SO_VERSION}
- VERSION
v${LIBHASHKIT
_VERSION})
+ SOVERSION ${LIBHASHKIT_SO_
SO
VERSION}
+ VERSION
${LIBHASHKIT_SO
_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
@@
-48,9
+41,15
@@
target_include_directories(libhashkit PUBLIC
configure_file(hashkitcon.h.in hashkitcon.h @ONLY)
install(TARGETS libhashkit EXPORT libhashkit-targets
configure_file(hashkitcon.h.in hashkitcon.h @ONLY)
install(TARGETS libhashkit EXPORT libhashkit-targets
- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 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::)
export(EXPORT libhashkit-targets NAMESPACE libmemcached::)
-install(EXPORT libhashkit-targets NAMESPACE libmemcached:: DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+install(EXPORT libhashkit-targets NAMESPACE libmemcached::
+ COMPONENT dev
+ DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
install_public_headers(
libhashkit
install_public_headers(
libhashkit