Merge pull request #101 from remicollet/issue-sover

fix libmemcached so version

diff --git a/docs/conf.py.in b/docs/conf.py.in
index c582244f92b6ff4378f0a6242ab59369011a895c..4dd335730e9d9d70123c33262e0bbedb93cc6905 100644 (file)
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -13,7 +13,7 @@ import sys, os
 #needs_sphinx = '1.0'
 extensions = [@SPHINX_EXTENSIONS@]
 templates_path = ['_templates']
-source_suffix = ['.rst']
+source_suffix = '.rst'
 master_doc = 'index'
 pygments_style = 'sphinx'
 

diff --git a/src/libhashkit/CMakeLists.txt b/src/libhashkit/CMakeLists.txt
index 81129ef76873424c741701808d6ba03410438214..48a9a1b9dab151aa8caf44ee7babf398d63319e5 100644 (file)
--- a/src/libhashkit/CMakeLists.txt
+++ b/src/libhashkit/CMakeLists.txt
@@ -49,7 +49,7 @@ install(TARGETS libhashkit EXPORT libhashkit-targets
 export(EXPORT libhashkit-targets NAMESPACE libmemcached::)
 install(EXPORT libhashkit-targets NAMESPACE libmemcached::
         COMPONENT dev
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
 install_public_headers(
         libhashkit

diff --git a/src/libmemcached/CMakeLists.txt b/src/libmemcached/CMakeLists.txt
index ebc5a213cdfcce2d58ac674c27724ddaae988fe1..ffa1c0ada8789c51ca3a5d3c4118da07fe0897c6 100644 (file)
--- a/src/libmemcached/CMakeLists.txt
+++ b/src/libmemcached/CMakeLists.txt
@@ -129,7 +129,7 @@ install(TARGETS libmemcached EXPORT libmemcached-targets
 export(EXPORT libmemcached-targets NAMESPACE libmemcached::)
 install(EXPORT libmemcached-targets NAMESPACE libmemcached::
         COMPONENT dev
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
 install_public_headers(
         libmemcached

diff --git a/src/libmemcachedprotocol/CMakeLists.txt b/src/libmemcachedprotocol/CMakeLists.txt
index 3e69aad9af329e7aa092b90279323fe8a0ef30c0..91bfe36c53cdb1d6df4bad663231d53d387c8a68 100644 (file)
--- a/src/libmemcachedprotocol/CMakeLists.txt
+++ b/src/libmemcachedprotocol/CMakeLists.txt
@@ -45,4 +45,4 @@ install(TARGETS libmemcachedprotocol EXPORT libmemcachedprotocol-targets
 export(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached::)
 install(EXPORT libmemcachedprotocol-targets NAMESPACE libmemcached::
         COMPONENT dev
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})

diff --git a/src/libmemcachedutil/CMakeLists.txt b/src/libmemcachedutil/CMakeLists.txt
index 88f1e8dfe13786607d7d1c196167815a600fdfa0..d99b065edfb1c6bf1c5026dcb74b5c485bf6d034 100644 (file)
--- a/src/libmemcachedutil/CMakeLists.txt
+++ b/src/libmemcachedutil/CMakeLists.txt
@@ -48,4 +48,4 @@ install(TARGETS libmemcachedutil EXPORT libmemcachedutil-targets
 export(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::)
 install(EXPORT libmemcachedutil-targets NAMESPACE libmemcached::
         COMPONENT dev
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})

diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
index a295562328e9830f27021ec3b14ccb4dba61a3b1..306168afe056569a65d2cf9cd4698b039862d488 100644 (file)
--- a/support/CMakeLists.txt
+++ b/support/CMakeLists.txt
@@ -27,7 +27,7 @@ endif()
 
 configure_package_config_file(libmemcached-config.cmake.in
         libmemcached-config.cmake
-        INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/)
+        INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 write_basic_package_version_file(libhashkit-version.cmake
         VERSION ${LIBHASHKIT_VERSION}
         COMPATIBILITY SameMajorVersion)
@@ -47,4 +47,4 @@ install(FILES
         ${CMAKE_CURRENT_BINARY_DIR}/libmemcachedprotocol-version.cmake
         ${CMAKE_CURRENT_BINARY_DIR}/libmemcachedutil-version.cmake
         COMPONENT dev
-        DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/cmake/)
+        DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/)

diff --git a/test/lib/MemcachedCluster.cpp b/test/lib/MemcachedCluster.cpp
index a443360b52b9b3082dcfb1d102e39098098bd048..4b1aa2c5989a26f78c46af1487cb5dae3deac25e 100644 (file)
--- a/test/lib/MemcachedCluster.cpp
+++ b/test/lib/MemcachedCluster.cpp
@@ -143,6 +143,6 @@ void MemcachedCluster::enableReplication() {
 
 void MemcachedCluster::killOneServer() const {
   const auto &servers = cluster.getServers();
-  const auto &victim = servers[random_num(0UL, servers.size() - 1)];
+  const auto &victim = servers[random_num((size_t)0, servers.size() - 1)];
   ::kill(victim.getPid(), SIGKILL);
 }