projects
/
m6w6
/
libmemcached
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
|
github
raw
|
inline
| side by side
cmake: compat with <3.12
[m6w6/libmemcached]
/
src
/
libhashkit
/
CMakeLists.txt
diff --git
a/src/libhashkit/CMakeLists.txt
b/src/libhashkit/CMakeLists.txt
index 20377d8ba34477a1197c4ced95136893e0678064..1a03de2365f25a72eafa7882d913be7352b974d7 100644
(file)
--- a/
src/libhashkit/CMakeLists.txt
+++ b/
src/libhashkit/CMakeLists.txt
@@
-1,9
+1,3
@@
-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
@@
-16,7
+10,7
@@
add_library(libhashkit SHARED
function.cc
has.cc
hashkit.cc
function.cc
has.cc
hashkit.cc
- ${HSIEH_CC}
+ hsieh.cc
jenkins.cc
md5.cc
murmur.cc
jenkins.cc
md5.cc
murmur.cc
@@
-33,8
+27,7
@@
set_target_properties(libhashkit PROPERTIES
CXX_STANDARD ${CXX_STANDARD}
LIBRARY_OUTPUT_NAME hashkit
LIBRARY_OUTPUT_NAME_DEBUG hashkit-dbg
CXX_STANDARD ${CXX_STANDARD}
LIBRARY_OUTPUT_NAME hashkit
LIBRARY_OUTPUT_NAME_DEBUG hashkit-dbg
- SOVERSION ${LIBHASHKIT_SO_VERSION}
- VERSION v${LIBHASHKIT_VERSION})
+ SOVERSION ${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
@@
-47,9
+40,14
@@
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})
+ LIBRARY
+ COMPONENT lib
+ ${TARGET_NAMELINK_COMPONENT}
+ DESTINATION ${CMAKE_INSTALL_LIBDIR})
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